Mercurial > emacs
changeset 34869:1d671133e618
(syms_of_xterm): DEFVAR_LISP x-toolkit-scroll-bars
instead of x-toolkit-scroll-bars-p.
(Vx_toolkit_scroll_bars): Renamed from x_toolkit_scroll_bars_p.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Wed, 27 Dec 2000 14:33:11 +0000 |
| parents | f3c217d2fc2e |
| children | 6c2c536e15aa |
| files | src/w32term.c src/xterm.c |
| diffstat | 2 files changed, 20 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/w32term.c Wed Dec 27 14:08:34 2000 +0000 +++ b/src/w32term.c Wed Dec 27 14:33:11 2000 +0000 @@ -145,9 +145,9 @@ extern Lisp_Object Qhelp_echo; -/* Non-zero means Emacs uses toolkit scroll bars. */ - -int x_toolkit_scroll_bars_p; +/* Non-nil means Emacs uses toolkit scroll bars. */ + +Lisp_Object Vx_toolkit_scroll_bars; /* If a string, w32_read_socket generates an event to display that string. (The display is done in read_char.) */ @@ -10359,9 +10359,9 @@ wide as that tab on the display."); x_stretch_cursor_p = 0; - DEFVAR_BOOL ("x-toolkit-scroll-bars-p", &x_toolkit_scroll_bars_p, + DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars, "If not nil, Emacs uses toolkit scroll bars."); - x_toolkit_scroll_bars_p = 1; + Vx_toolkit_scroll_bars = Qt; staticpro (&last_mouse_motion_frame); last_mouse_motion_frame = Qnil;
--- a/src/xterm.c Wed Dec 27 14:08:34 2000 +0000 +++ b/src/xterm.c Wed Dec 27 14:33:11 2000 +0000 @@ -230,9 +230,9 @@ extern Lisp_Object Qhelp_echo; -/* Non-zero means Emacs uses toolkit scroll bars. */ - -int x_toolkit_scroll_bars_p; +/* Non-nil means Emacs uses toolkit scroll bars. */ + +Lisp_Object Vx_toolkit_scroll_bars; /* If a string, XTread_socket generates an event to display that string. (The display is done in read_char.) */ @@ -14006,12 +14006,20 @@ wide as that tab on the display."); x_stretch_cursor_p = 0; - DEFVAR_BOOL ("x-toolkit-scroll-bars-p", &x_toolkit_scroll_bars_p, - "If not nil, Emacs uses toolkit scroll bars."); + DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars, + "What X toolkit scroll bars Emacs uses.\n\ +A value of nil means Emacs doesn't use X toolkit scroll bars.\n\ +Otherwise, value is a symbol describing the X toolkit."); #ifdef USE_TOOLKIT_SCROLL_BARS - x_toolkit_scroll_bars_p = 1; +#ifdef USE_MOTIF + Vx_toolkit_scroll_bars = intern ("motif"); +#elif defined HAVE_XAW3D + Vx_toolkit_scroll_bars = intern ("xaw3d"); #else - x_toolkit_scroll_bars_p = 0; + Vx_toolkit_scroll_bars = intern ("xaw"); +#endif +#else + Vx_toolkit_scroll_bars = Qnil; #endif staticpro (&last_mouse_motion_frame);