Mercurial > emacs
diff src/frame.c @ 107985:9a1538888aae
merge trunk
| author | Kenichi Handa <handa@etlken> |
|---|---|
| date | Tue, 20 Apr 2010 13:24:33 +0900 |
| parents | 75e87467a0db |
| children | bef5d1738c0b |
line wrap: on
line diff
--- a/src/frame.c Mon Mar 08 20:39:36 2010 +0900 +++ b/src/frame.c Tue Apr 20 13:24:33 2010 +0900 @@ -4005,6 +4005,13 @@ case RES_TYPE_NUMBER: return make_number (atoi (SDATA (tem))); + case RES_TYPE_BOOLEAN_NUMBER: + if (!strcmp (SDATA (tem), "on") + || !strcmp (SDATA (tem), "true")) + return make_number (1); + return make_number (atoi (SDATA (tem))); + break; + case RES_TYPE_FLOAT: return make_float (atof (SDATA (tem))); @@ -4584,8 +4591,9 @@ 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. */ +#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;