Mercurial > emacs

comparison src/frame.c @ 107985:9a1538888aae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge trunk
author Kenichi Handa <handa@etlken>
date Tue, 20 Apr 2010 13:24:33 +0900
parents 75e87467a0db
children bef5d1738c0b
comparison
equal deleted inserted replaced
107353:14a34dbaa721 107985:9a1538888aae
4003 switch (type) 4003 switch (type)
4004 { 4004 {
4005 case RES_TYPE_NUMBER: 4005 case RES_TYPE_NUMBER:
4006 return make_number (atoi (SDATA (tem))); 4006 return make_number (atoi (SDATA (tem)));
4007 4007
4008 case RES_TYPE_BOOLEAN_NUMBER:
4009 if (!strcmp (SDATA (tem), "on")
4010 || !strcmp (SDATA (tem), "true"))
4011 return make_number (1);
4012 return make_number (atoi (SDATA (tem)));
4013 break;
4014
4008 case RES_TYPE_FLOAT: 4015 case RES_TYPE_FLOAT:
4009 return make_float (atof (SDATA (tem))); 4016 return make_float (atof (SDATA (tem)));
4010 4017
4011 case RES_TYPE_BOOLEAN: 4018 case RES_TYPE_BOOLEAN:
4012 tem = Fdowncase (tem); 4019 tem = Fdowncase (tem);
4582 Vdefault_frame_alist = Qnil; 4589 Vdefault_frame_alist = Qnil;
4583 4590
4584 DEFVAR_LISP ("default-frame-scroll-bars", &Vdefault_frame_scroll_bars, 4591 DEFVAR_LISP ("default-frame-scroll-bars", &Vdefault_frame_scroll_bars,
4585 doc: /* Default position of scroll bars on this window-system. */); 4592 doc: /* Default position of scroll bars on this window-system. */);
4586 #ifdef HAVE_WINDOW_SYSTEM 4593 #ifdef HAVE_WINDOW_SYSTEM
4587 #if defined(HAVE_NTGUI) || defined(NS_IMPL_COCOA) 4594 #if defined(HAVE_NTGUI) || defined(NS_IMPL_COCOA) || (defined(USE_GTK) && defined(USE_TOOLKIT_SCROLL_BARS))
4588 /* MS-Windows and Mac OS X have scroll bars on the right by default. */ 4595 /* MS-Windows, Mac OS X, and GTK have scroll bars on the right by
4596 default. */
4589 Vdefault_frame_scroll_bars = Qright; 4597 Vdefault_frame_scroll_bars = Qright;
4590 #else 4598 #else
4591 Vdefault_frame_scroll_bars = Qleft; 4599 Vdefault_frame_scroll_bars = Qleft;
4592 #endif 4600 #endif
4593 #else 4601 #else