From 4a1b9832c0338d7f2ecbf66f47dd2a834bd1b14b Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 8 Jun 2011 18:11:15 -0700 Subject: [PATCH] * xfns.c (x_set_scroll_bar_default_width): Remove unused 'int' locals. --- src/ChangeLog | 2 ++ src/xfns.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index f3ed5f66161..638e0c6a0b1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-06-09 Paul Eggert + * xfns.c (x_set_scroll_bar_default_width): Remove unused 'int' locals. + * buffer.h (PTR_BYTE_POS): Don't assume a byte count fits in 'unsigned'. * buffer.c (Fgenerate_new_buffer_name): Use EMACS_INT for count, not int. diff --git a/src/xfns.c b/src/xfns.c index c307cc345e3..25fa05c0a6e 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -1695,14 +1695,14 @@ void x_set_scroll_bar_default_width (struct frame *f) { int wid = FRAME_COLUMN_WIDTH (f); - int minw = 16; - int width; #ifdef USE_TOOLKIT_SCROLL_BARS #ifdef USE_GTK - minw = xg_get_default_scrollbar_width (f); + int minw = xg_get_default_scrollbar_width (f); +#else + int minw = 16; #endif /* A minimum width of 14 doesn't look good for toolkit scroll bars. */ - width = minw + 2 * VERTICAL_SCROLL_BAR_WIDTH_TRIM; + int width = minw + 2 * VERTICAL_SCROLL_BAR_WIDTH_TRIM; FRAME_CONFIG_SCROLL_BAR_COLS (f) = (width + wid - 1) / wid; FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = width; #else -- 2.39.2