aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2012-01-30 19:07:38 -0800
committerGlenn Morris2012-01-30 19:07:38 -0800
commit9789766834854891756f4acef96c5e6680ae6218 (patch)
tree99b7deac4fec2b91e36837c1d10eab6a3db0a15f /src
parent4789358111435e41a6389a439066b2b7eb6df40f (diff)
downloademacs-9789766834854891756f4acef96c5e6680ae6218.tar.gz
emacs-9789766834854891756f4acef96c5e6680ae6218.zip
x-toolkit-scroll-bars doc fix.
* src/nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>: * src/xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Sync docs.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/nsterm.m7
-rw-r--r--src/xterm.c3
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 @@
12012-01-31 Glenn Morris <rgm@gnu.org>
2
3 * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
4 * xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Sync docs.
5
12012-01-29 Glenn Morris <rgm@gnu.org> 62012-01-29 Glenn Morris <rgm@gnu.org>
2 7
3 * gnutls.c (syms_of_gnutls): More doc (from etc/NEWS). 8 * 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. */);
6735 6735
6736 /* TODO: move to common code */ 6736 /* TODO: move to common code */
6737 DEFVAR_LISP ("x-toolkit-scroll-bars", Vx_toolkit_scroll_bars, 6737 DEFVAR_LISP ("x-toolkit-scroll-bars", Vx_toolkit_scroll_bars,
6738 doc: /* If not nil, Emacs uses toolkit scroll bars. */); 6738 doc: /* Which toolkit scroll bars Emacs uses, if any.
6739A value of nil means Emacs doesn't use toolkit scroll bars.
6740With the X Window system, the value is a symbol describing the
6741X toolkit. Possible values are: gtk, motif, xaw, or xaw3d.
6742With MS Windows, the value is t. With Nextstep, the value is
6743t or nil. */);
6739#ifdef USE_TOOLKIT_SCROLL_BARS 6744#ifdef USE_TOOLKIT_SCROLL_BARS
6740 Vx_toolkit_scroll_bars = Qt; 6745 Vx_toolkit_scroll_bars = Qt;
6741#else 6746#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. */);
10844A value of nil means Emacs doesn't use toolkit scroll bars. 10844A value of nil means Emacs doesn't use toolkit scroll bars.
10845With the X Window system, the value is a symbol describing the 10845With the X Window system, the value is a symbol describing the
10846X toolkit. Possible values are: gtk, motif, xaw, or xaw3d. 10846X toolkit. Possible values are: gtk, motif, xaw, or xaw3d.
10847With MS Windows, the value is t. */); 10847With MS Windows, the value is t. With Nextstep, the value is
10848t or nil. */);
10848#ifdef USE_TOOLKIT_SCROLL_BARS 10849#ifdef USE_TOOLKIT_SCROLL_BARS
10849#ifdef USE_MOTIF 10850#ifdef USE_MOTIF
10850 Vx_toolkit_scroll_bars = intern_c_string ("motif"); 10851 Vx_toolkit_scroll_bars = intern_c_string ("motif");