summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/frame.c5
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 5f9e246ff60..7c73acf2ce7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-12 Chong Yidong <cyd@stupidchicken.com>
+
+ * frame.c (Vdefault_frame_scroll_bars): Set default to Qright for
+ all window systems.
+
2010-03-12 Eli Zaretskii <eliz@gnu.org>
* Makefilie.in (termcapobj): Move termcap.o from here...
diff --git a/src/frame.c b/src/frame.c
index f05f9f751da..c779f1c5b65 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4584,13 +4584,8 @@ 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)
- /* MS-Windows and Mac OS X 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