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

4a1b9832 · Paul Eggert · 8f95c75c · 4a1b9832 · 4a1b9832
Commit 4a1b9832 authored Jun 08, 2011 by Paul Eggert
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

src/ChangeLog src/ChangeLog +2 -0

src/xfns.c src/xfns.c +4 -4

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 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.

--- 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