From 6155205e82b591c216784f573f8d300db6186765 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Thu, 12 Sep 2002 03:26:23 +0000 Subject: [PATCH] (x_report_frame_params): If FRAME_SCROLL_BAR_PIXEL_WIDTH is 0 and we have non-toolkit scroll bars, return nil for scroll-bar-width. --- src/xfns.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/xfns.c b/src/xfns.c index 8788906e773..e0cc81a3e47 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1295,9 +1295,13 @@ x_report_frame_params (f, alistptr) 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)); + (! 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)); -- 2.39.2