[Emacs-diffs] /srv/bzr/emacs/trunk r107021: x-toolkit-scroll-bars doc fix.

[Glenn Morris]

------------------------------------------------------------
revno: 107021
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-01-30 19:07:38 -0800
message:
  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.
modified:
  src/ChangeLog
  src/nsterm.m
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-01-29 03:08:15 +0000
+++ b/src/ChangeLog     2012-01-31 03:07:38 +0000
@@ -1,3 +1,8 @@
+2012-01-31  Glenn Morris  <address@hidden>
+
+       * nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>:
+       * xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Sync docs.
+
 2012-01-29  Glenn Morris  <address@hidden>
 
        * gnutls.c (syms_of_gnutls): More doc (from etc/NEWS).

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2012-01-19 07:21:25 +0000
+++ b/src/nsterm.m      2012-01-31 03:07:38 +0000
@@ -6735,7 +6735,12 @@
 
   /* 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

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2012-01-19 07:21:25 +0000
+++ b/src/xterm.c       2012-01-31 03:07:38 +0000
@@ -10844,7 +10844,8 @@
 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");