* xfns.c (x_set_scroll_bar_default_width): Remove unused 'int' locals.

diff --git a/src/ChangeLog b/src/ChangeLog
index f3ed5f66161439191ca6515c82996c5aee47a278..638e0c6a0b1111291dca4477814b087e36d65c0c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-06-09  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * 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 c307cc345e3243fd16e65c78001b343a026d69cc..25fa05c0a6ec3f77616a50eaf226f66128f7bd3f 100644 (file)
--- 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