* buffer.c (Qclone_number): Remove for now, as it's unused.

[bpt/emacs.git] / src / xfns.c

diff --git a/src/xfns.c b/src/xfns.c
index 3d74ead..8417db7 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1699,14 +1699,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