[Emacs-diffs] Changes to emacs/src/xfns.c

[Richard M. Stallman]

Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.559 emacs/src/xfns.c:1.560
*** emacs/src/xfns.c:1.559      Sun Sep  1 09:44:53 2002
--- emacs/src/xfns.c    Wed Sep 11 23:26:23 2002
***************
*** 1295,1303 ****
    store_in_alist (alistptr, Qright_fringe,
                   make_number (f->output_data.x->right_fringe_width));
    store_in_alist (alistptr, Qscroll_bar_width,
!            make_number (FRAME_HAS_VERTICAL_SCROLL_BARS (f)
!                         ? FRAME_SCROLL_BAR_PIXEL_WIDTH(f)
!                         : 0));
    sprintf (buf, "%ld", (long) FRAME_X_WINDOW (f));
    store_in_alist (alistptr, Qwindow_id,
                   build_string (buf));
--- 1295,1307 ----
    store_in_alist (alistptr, Qright_fringe,
                   make_number (f->output_data.x->right_fringe_width));
    store_in_alist (alistptr, Qscroll_bar_width,
!                 (! FRAME_HAS_VERTICAL_SCROLL_BARS (f)
!                  ? make_number (0)
!                  : FRAME_SCROLL_BAR_PIXEL_WIDTH (f) > 0
!                  ? make_number (FRAME_SCROLL_BAR_PIXEL_WIDTH (f))
!                  /* nil means "use default width"
!                     for non-toolkit scroll bar */
!                  : Qnil));
    sprintf (buf, "%ld", (long) FRAME_X_WINDOW (f));
    store_in_alist (alistptr, Qwindow_id,
                   build_string (buf));