Commit 5bf04520 authored by Gerd Moellmann's avatar Gerd Moellmann

(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.
parent 25050dab
......@@ -145,9 +145,9 @@ static HBITMAP ov_bmp;
extern Lisp_Object Qhelp_echo;
/* Non-zero means Emacs uses toolkit scroll bars. */
/* Non-nil means Emacs uses toolkit scroll bars. */
int x_toolkit_scroll_bars_p;
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 @@ For example, if a block cursor is over a tab, it will be drawn as\n\
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;
......
......@@ -230,9 +230,9 @@ static unsigned char ov_bits[] = {
extern Lisp_Object Qhelp_echo;
/* Non-zero means Emacs uses toolkit scroll bars. */
/* Non-nil means Emacs uses toolkit scroll bars. */
int x_toolkit_scroll_bars_p;
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 @@ For example, if a block cursor is over a tab, it will be drawn as\n\
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
Vx_toolkit_scroll_bars = intern ("xaw");
#endif
#else
x_toolkit_scroll_bars_p = 0;
Vx_toolkit_scroll_bars = Qnil;
#endif
staticpro (&last_mouse_motion_frame);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment