Fix scroll bar handling for non-toolkit builds.

* frame.h (FRAME_HAS_HORIZONTAL_SCROLL_BARS): Condition
correctly according to toolkit used.
* frame.c (make_initial_frame, make_terminal_frame)
(x_set_horizontal_scroll_bars, x_set_scroll_bar_height)
(Vdefault_frame_horizontal_scroll_bars): Correctly condition
assignments according to presence of toolkit scrollbars.
* window.h (WINDOW_HAS_HORIZONTAL_SCROLL_BAR): Condition
correctly according to toolkit used.
* window.c (set_window_scroll_bars): Set horizontal scroll bar
only if toolkit supports it.
* w32term.c (w32_redeem_scroll_bar): Always redeem scroll bar if
present.
* xterm.c (x_scroll_bar_create): Initialize horizontal slot for
non-toolkit builds.
(XTredeem_scroll_bar): Always redeem scroll bar if present.

1 files changed, 31 insertions, 22 deletions

diff --git a/src/window.c b/src/window.c
index e3554ea032e..049c0d122a3 100644
--- a/src/window.c
+++ b/src/window.c
@@ -7299,7 +7299,6 @@ set_window_scroll_bars (struct window *w, Lisp_Object width,
                         Lisp_Object horizontal_type)
 {
   int iwidth = (NILP (width) ? -1 : (CHECK_NATNUM (width), XINT (width)));
-  int iheight = (NILP (height) ? -1 : (CHECK_NATNUM (height), XINT (height)));
   bool changed = 0;
 
   if (iwidth == 0)
@@ -7327,29 +7326,39 @@ set_window_scroll_bars (struct window *w, Lisp_Object width,
         }
     }
 
-  if (MINI_WINDOW_P (w) || iheight == 0)
-    horizontal_type = Qnil;
+#if (defined (HAVE_WINDOW_SYSTEM)                                       \
+     && ((defined (USE_TOOLKIT_SCROLL_BARS) && !defined (HAVE_NS))      \
+         || defined (HAVE_NTGUI)))
+  {
+    int iheight = (NILP (height) ? -1 : (CHECK_NATNUM (height), XINT (height)));
 
-  if (!(NILP (horizontal_type)
-        || EQ (horizontal_type, Qbottom)
-        || EQ (horizontal_type, Qt)))
-    error ("Invalid type of horizontal scroll bar");
+    if (MINI_WINDOW_P (w) || iheight == 0)
+      horizontal_type = Qnil;
 
-  if (w->scroll_bar_height != iheight
-      || !EQ (w->horizontal_scroll_bar_type, horizontal_type))
-    {
-      /* Don't change anything if new scroll bar won't fit.  */
-      if ((WINDOW_PIXEL_HEIGHT (w)
-           - WINDOW_HEADER_LINE_HEIGHT (w)
-           - WINDOW_MODE_LINE_HEIGHT (w)
-           - max (iheight, 0))
-          >= MIN_SAFE_WINDOW_PIXEL_HEIGHT (w))
-        {
-          w->scroll_bar_height = iheight;
-          wset_horizontal_scroll_bar_type (w, horizontal_type);
-          changed = 1;
-        }
-    }
+    if (!(NILP (horizontal_type)
+          || EQ (horizontal_type, Qbottom)
+          || EQ (horizontal_type, Qt)))
+      error ("Invalid type of horizontal scroll bar");
+
+    if (w->scroll_bar_height != iheight
+        || !EQ (w->horizontal_scroll_bar_type, horizontal_type))
+      {
+        /* Don't change anything if new scroll bar won't fit.  */
+        if ((WINDOW_PIXEL_HEIGHT (w)
+             - WINDOW_HEADER_LINE_HEIGHT (w)
+             - WINDOW_MODE_LINE_HEIGHT (w)
+             - max (iheight, 0))
+            >= MIN_SAFE_WINDOW_PIXEL_HEIGHT (w))
+          {
+            w->scroll_bar_height = iheight;
+            wset_horizontal_scroll_bar_type (w, horizontal_type);
+            changed = 1;
+          }
+      }
+  }
+#else
+  wset_horizontal_scroll_bar_type (w, Qnil);
+#endif
 
   return changed ? w : NULL;
 }