From 9789766834854891756f4acef96c5e6680ae6218 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 30 Jan 2012 19:07:38 -0800 Subject: [PATCH] x-toolkit-scroll-bars doc fix. * src/nsterm.m (syms_of_nsterm) : * src/xterm.c (syms_of_xterm) : Sync docs. --- src/ChangeLog | 5 +++++ src/nsterm.m | 7 ++++++- src/xterm.c | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 89fa90d9f92..8d32b6a32c8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-01-31 Glenn Morris + + * nsterm.m (syms_of_nsterm) : + * xterm.c (syms_of_xterm) : Sync docs. + 2012-01-29 Glenn Morris * gnutls.c (syms_of_gnutls): More doc (from etc/NEWS). diff --git a/src/nsterm.m b/src/nsterm.m index 70d3cc0e8b8..1fbd3813fc7 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -6735,7 +6735,12 @@ Only works on OSX 10.6 or later. */); /* TODO: move to common code */ DEFVAR_LISP ("x-toolkit-scroll-bars", Vx_toolkit_scroll_bars, - doc: /* If not nil, Emacs uses toolkit scroll bars. */); + doc: /* Which toolkit scroll bars Emacs uses, if any. +A value of nil means Emacs doesn't use toolkit scroll bars. +With the X Window system, the value is a symbol describing the +X toolkit. Possible values are: gtk, motif, xaw, or xaw3d. +With MS Windows, the value is t. With Nextstep, the value is +t or nil. */); #ifdef USE_TOOLKIT_SCROLL_BARS Vx_toolkit_scroll_bars = Qt; #else diff --git a/src/xterm.c b/src/xterm.c index 4b34d6344ac..8fd0c0d24f7 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -10844,7 +10844,8 @@ selected window or cursor position is preserved. */); A value of nil means Emacs doesn't use toolkit scroll bars. With the X Window system, the value is a symbol describing the X toolkit. Possible values are: gtk, motif, xaw, or xaw3d. -With MS Windows, the value is t. */); +With MS Windows, the value is t. With Nextstep, the value is +t or nil. */); #ifdef USE_TOOLKIT_SCROLL_BARS #ifdef USE_MOTIF Vx_toolkit_scroll_bars = intern_c_string ("motif"); -- 2.39.2