Mercurial > emacs

comparison src/frame.c @ 107421:eab59b26377e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from trunk
author Jan D. <jan.h.d@swipnet.se>
date Mon, 15 Mar 2010 09:18:20 +0100
parents f5c46cf84e9f
children 05f285327bae
comparison
equal deleted inserted replaced
107420:961da90b22a3 107421:eab59b26377e
4582 Vdefault_frame_alist = Qnil; 4582 Vdefault_frame_alist = Qnil;
4583 4583
4584 DEFVAR_LISP ("default-frame-scroll-bars", &Vdefault_frame_scroll_bars, 4584 DEFVAR_LISP ("default-frame-scroll-bars", &Vdefault_frame_scroll_bars,
4585 doc: /* Default position of scroll bars on this window-system. */); 4585 doc: /* Default position of scroll bars on this window-system. */);
4586 #ifdef HAVE_WINDOW_SYSTEM 4586 #ifdef HAVE_WINDOW_SYSTEM
4587 #if defined(HAVE_NTGUI) || defined(NS_IMPL_COCOA)
4588 /* MS-Windows and Mac OS X have scroll bars on the right by default. */
4589 Vdefault_frame_scroll_bars = Qright; 4587 Vdefault_frame_scroll_bars = Qright;
4590 #else
4591 Vdefault_frame_scroll_bars = Qleft;
4592 #endif
4593 #else 4588 #else
4594 Vdefault_frame_scroll_bars = Qnil; 4589 Vdefault_frame_scroll_bars = Qnil;
4595 #endif 4590 #endif
4596 4591
4597 DEFVAR_LISP ("terminal-frame", &Vterminal_frame, 4592 DEFVAR_LISP ("terminal-frame", &Vterminal_frame,