[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/frame.c
From: |
Kim F. Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/frame.c |
Date: |
Sat, 20 Sep 2003 19:26:20 -0400 |
Index: emacs/src/frame.c
diff -c emacs/src/frame.c:1.301 emacs/src/frame.c:1.302
*** emacs/src/frame.c:1.301 Mon Sep 1 11:45:52 2003
--- emacs/src/frame.c Sat Sep 20 19:26:20 2003
***************
*** 114,119 ****
--- 114,120 ----
Lisp_Object Vterminal_frame;
Lisp_Object Vdefault_frame_alist;
+ Lisp_Object Vdefault_frame_scroll_bars;
Lisp_Object Vmouse_position_function;
Lisp_Object Vmouse_highlight;
Lisp_Object Vdelete_frame_functions;
***************
*** 3217,3229 ****
? vertical_scroll_bar_left
: EQ (Qright, arg)
? vertical_scroll_bar_right
! #ifdef HAVE_NTGUI
! /* MS-Windows has scroll bars on the right by default. */
! : vertical_scroll_bar_right
! #else
! : vertical_scroll_bar_left
! #endif
! );
/* We set this parameter before creating the X window for the
frame, so we can get the geometry right from the start.
--- 3218,3228 ----
? vertical_scroll_bar_left
: EQ (Qright, arg)
? vertical_scroll_bar_right
! : EQ (Qleft, Vdefault_frame_scroll_bars)
! ? vertical_scroll_bar_left
! : EQ (Qright, Vdefault_frame_scroll_bars)
! ? vertical_scroll_bar_right
! : vertical_scroll_bar_none);
/* We set this parameter before creating the X window for the
frame, so we can get the geometry right from the start.
***************
*** 4031,4036 ****
--- 4030,4048 ----
have menu bars; `menu-bar-mode' works by altering this element.
Setting this variable does not affect existing frames, only new ones. */);
Vdefault_frame_alist = Qnil;
+
+ 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(HAVE_CARBON)
+ /* MS-Windows has 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
Qinhibit_default_face_x_resources
= intern ("inhibit-default-face-x-resources");