# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1268691289 0
# Node ID ffc9d2c92c8327c67f555550e5278fdb85228b89
# Parent  e58f63afd9019ada81a375be983aab1f11e9e315# Parent  05f285327baeb34ee237e80a8691a652b91bfe6b
Merge from mainline.

diff -r e58f63afd901 -r ffc9d2c92c83 etc/NEWS
--- a/etc/NEWS	Mon Mar 15 01:43:38 2010 +0000
+++ b/etc/NEWS	Mon Mar 15 22:14:49 2010 +0000
@@ -30,7 +30,7 @@
 
 * 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.
 
 
diff -r e58f63afd901 -r ffc9d2c92c83 src/ChangeLog
--- a/src/ChangeLog	Mon Mar 15 01:43:38 2010 +0000
+++ b/src/ChangeLog	Mon Mar 15 22:14:49 2010 +0000
@@ -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 -r e58f63afd901 -r ffc9d2c92c83 src/frame.c
--- a/src/frame.c	Mon Mar 15 01:43:38 2010 +0000
+++ b/src/frame.c	Mon Mar 15 22:14:49 2010 +0000
@@ -4584,8 +4584,14 @@
   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 -r e58f63afd901 -r ffc9d2c92c83 src/xfns.c
--- a/src/xfns.c	Mon Mar 15 01:43:38 2010 +0000
+++ b/src/xfns.c	Mon Mar 15 22:14:49 2010 +0000
@@ -3376,7 +3376,12 @@
 #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);