6 files changed, 14 insertions, 20 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cfafd9d8fa3..4f189e5be38 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2014-09-03  Martin Rudalics  <rudalics@gmx.at>
+
+        * buffer.c (scroll-bar-height): Fix typo in doc-string.
+        * frame.c (Vdefault_frame_horizontal_scroll_bars): Remove
+        variable.
+        * nsfns.m (Fx_create_frame):
+        * w32fns.c (Fx_create_frame):
+        * xfns.c (Fx_create_frame): Default horizontal scroll bars to
+        nil.
+
 2014-09-03  Eli Zaretskii  <eliz@gnu.org>
 
         * dispnew.c (buffer_posn_from_coords): Fix an off-by-one error in
diff --git a/src/buffer.c b/src/buffer.c
index 62431cb8fe1..45e614fb449 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5919,7 +5919,7 @@ A value of nil means to use the scroll bar width from the window's frame.  */);
   DEFVAR_PER_BUFFER ("scroll-bar-height", &BVAR (current_buffer, scroll_bar_height),
                      Qintegerp,
                      doc: /* Height of this buffer's scroll bars in pixels.
-A value of nil means to use the scroll bar heiht from the window's frame.  */);
+A value of nil means to use the scroll bar height from the window's frame.  */);
 
   DEFVAR_PER_BUFFER ("vertical-scroll-bar", &BVAR (current_buffer, vertical_scroll_bar_type),
                      Qvertical_scroll_bar,
diff --git a/src/frame.c b/src/frame.c
index 501f01a3122..96617976ecd 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4872,16 +4872,6 @@ Setting this variable does not affect existing frames, only new ones.  */);
   Vdefault_frame_scroll_bars = Qnil;
 #endif
 
-  DEFVAR_LISP ("default-frame-horizontal-scroll-bars", Vdefault_frame_horizontal_scroll_bars,
-               doc: /* Default value for horizontal scroll bars on this window-system.  */);
-#if (defined (HAVE_WINDOW_SYSTEM)                                       \
-     && ((defined (USE_TOOLKIT_SCROLL_BARS) && !defined (HAVE_NS))      \
-         || defined (HAVE_NTGUI)))
-  Vdefault_frame_horizontal_scroll_bars = Qt;
-#else
-  Vdefault_frame_horizontal_scroll_bars = Qnil;
-#endif
-
   DEFVAR_BOOL ("scroll-bar-adjust-thumb-portion",
                scroll_bar_adjust_thumb_portion_p,
                doc: /* Adjust thumb for overscrolling for Gtk+ and MOTIF.
diff --git a/src/nsfns.m b/src/nsfns.m
index ca8f4922ccd..052c428fae5 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1244,7 +1244,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
                            "verticalScrollBars", "VerticalScrollBars",
                            RES_TYPE_SYMBOL);
   }
-  x_default_parameter (f, parms, Qhorizontal_scroll_bars, Qt,
+  x_default_parameter (f, parms, Qhorizontal_scroll_bars, Qnil,
                        "horizontalScrollBars", "HorizontalScrollBars",
                        RES_TYPE_SYMBOL);
   x_default_parameter (f, parms, Qforeground_color, build_string ("Black"),
diff --git a/src/w32fns.c b/src/w32fns.c
index ac0e693e1c0..fee80d24690 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -4569,7 +4569,7 @@ This function is an internal primitive--use `make-frame' instead.  */)
                        NULL, NULL, RES_TYPE_NUMBER);
   x_default_parameter (f, parameters, Qvertical_scroll_bars, Qright,
                        "verticalScrollBars", "ScrollBars", RES_TYPE_SYMBOL);
-  x_default_parameter (f, parameters, Qhorizontal_scroll_bars, Qbottom,
+  x_default_parameter (f, parameters, Qhorizontal_scroll_bars, Qnil,
                        "horizontalScrollBars", "ScrollBars", RES_TYPE_SYMBOL);
 
   /* Also do the stuff which must be set before the window exists.  */
diff --git a/src/xfns.c b/src/xfns.c
index 0c07d6cb03d..ec915a69f80 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3112,15 +3112,9 @@ This function is an internal primitive--use `make-frame' instead.  */)
 #endif
                        "verticalScrollBars", "ScrollBars",
                        RES_TYPE_SYMBOL);
-  x_default_parameter (f, parms, Qhorizontal_scroll_bars,
-#if defined (USE_GTK) && defined (USE_TOOLKIT_SCROLL_BARS)
-                       Qt,
-#else
-                       Qnil,
-#endif
+  x_default_parameter (f, parms, Qhorizontal_scroll_bars, Qnil,
                        "horizontalScrollBars", "ScrollBars",
                        RES_TYPE_SYMBOL);
-
   /* Also do the stuff which must be set before the window exists.  */
   x_default_parameter (f, parms, Qforeground_color, build_string ("black"),
                        "foreground", "Foreground", RES_TYPE_STRING);