[Emacs-diffs] /srv/bzr/emacs/trunk r99666: Put non-GTK X scroll-bars on left.

[Chong Yidong]

------------------------------------------------------------
revno: 99666
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2010-03-15 13:16:46 -0400
message:
  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.
modified:
  etc/NEWS
  src/ChangeLog
  src/frame.c
  src/xfns.c

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2010-03-13 20:33:54 +0000
+++ b/etc/NEWS  2010-03-15 17:16:46 +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.
 
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-03-13 19:54:29 +0000
+++ b/src/ChangeLog     2010-03-15 17:16:46 +0000
@@ -1,3 +1,9 @@
+2010-03-15  Chong Yidong  <address@hidden>
+
+       * xfns.c (Fx_create_frame):
+       * frame.c (Vdefault_frame_scroll_bars): Put non-GTK X scroll-bars
+       on left.
+
 2010-03-13  Andreas Politz  <address@hidden>  (tiny change)
 
        * editfns.c (Fformat): Account for string precision when computing

=== modified file 'src/frame.c'
--- a/src/frame.c       2010-03-12 17:32:30 +0000
+++ b/src/frame.c       2010-03-15 17:16:46 +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
 

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2010-03-12 23:13:02 +0000
+++ b/src/xfns.c        2010-03-15 17:16:46 +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);