Put non-GTK X scroll-bars on left.

* xfns.c (Fx_create_frame):
* frame.c (Vdefault_frame_scroll_bars): Put non-GTK X scroll-bars on left.

diff --git a/etc/NEWS b/etc/NEWS
index d8061589fb96348af7329cd21f20f3aa8fa29551..ee4ec1370cbec2db5fd2fcf8d098858d5b9321aa 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -30,7 +30,7 @@ so we will look at it and add it to the manual.
 \f
 * Changes in Emacs 24.1
 
-** The scroll-bar is now on the right on GNU/Linux and UNIX-like systems.
+** GTK scroll-bars are now placed on the right by default.
 Use `set-scroll-bar-mode' to change this.
 
 \f

diff --git a/src/ChangeLog b/src/ChangeLog
index da4e336b0aec1c88e4646480c3f82325542f5750..e62f3cb8bc3227f47943ea71de99d5caf3d7e499 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-15  Chong Yidong  <cyd@stupidchicken.com>
+
+       * xfns.c (Fx_create_frame):
+       * frame.c (Vdefault_frame_scroll_bars): Put non-GTK X scroll-bars
+       on left.
+
 2010-03-13  Andreas Politz  <politza@fh-trier.de>  (tiny change)
 
        * editfns.c (Fformat): Account for string precision when computing

diff --git a/src/frame.c b/src/frame.c
index c779f1c5b6542e571629e95fc7d21dbb6bdb65ae..40930af594ce334c520aa5666758b04c53ab9e08 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -4584,7 +4584,13 @@ Setting this variable does not affect existing frames, only new ones.  */);
   DEFVAR_LISP ("default-frame-scroll-bars", &Vdefault_frame_scroll_bars,
               doc: /* Default position of scroll bars on this window-system.  */);
 #ifdef HAVE_WINDOW_SYSTEM
+#if defined(HAVE_NTGUI) || defined(NS_IMPL_COCOA) || (defined(USE_GTK) && defined(USE_TOOLKIT_SCROLL_BARS))
+  /* MS-Windows, Mac OS X, and GTK have scroll bars on the right by
+     default.  */
   Vdefault_frame_scroll_bars = Qright;
+#else
+  Vdefault_frame_scroll_bars = Qleft;
+#endif
 #else
   Vdefault_frame_scroll_bars = Qnil;
 #endif

diff --git a/src/xfns.c b/src/xfns.c
index 84d0d622200afa2621c549339ac4227c2060b2d9..45bea1e4ec241dfaee2b043985c2e8bc2ecb419f 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3376,7 +3376,12 @@ This function is an internal primitive--use `make-frame' instead.  */)
 #endif
                       "internalBorderWidth", "internalBorderWidth",
                       RES_TYPE_NUMBER);
-  x_default_parameter (f, parms, Qvertical_scroll_bars, Qright,
+  x_default_parameter (f, parms, Qvertical_scroll_bars,
+#if defined(USE_GTK) && defined(USE_TOOLKIT_SCROLL_BARS)
+                      Qright,
+#else
+                      Qleft,
+#endif
                       "verticalScrollBars", "ScrollBars",
                       RES_TYPE_SYMBOL);