[Emacs-diffs] /srv/bzr/emacs/trunk r102068: Sync X and MS-Windows docs of x-toolkit-scroll-bars.

[Glenn Morris]

------------------------------------------------------------
revno: 102068
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-23 18:15:43 -0700
message:
  Sync X and MS-Windows docs of x-toolkit-scroll-bars.
  * src/w32term.c (syms_of_w32term) <x-toolkit-scroll-bars>:
  * src/xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Sync docs.
modified:
  src/ChangeLog
  src/w32term.c
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-10-23 21:21:49 +0000
+++ b/src/ChangeLog     2010-10-24 01:15:43 +0000
@@ -1,3 +1,8 @@
+2010-10-24  Glenn Morris  <address@hidden>
+
+       * w32term.c (syms_of_w32term) <x-toolkit-scroll-bars>:
+       * xterm.c (syms_of_xterm) <x-toolkit-scroll-bars>: Sync docs.
+
 2010-10-23  Glenn Morris  <address@hidden>
 
        * buffer.c (syms_of_buffer) <cursor-in-non-selected-windows>:

=== modified file 'src/w32term.c'
--- a/src/w32term.c     2010-10-14 14:32:27 +0000
+++ b/src/w32term.c     2010-10-24 01:15:43 +0000
@@ -1,7 +1,8 @@
 /* Implementation of GUI terminal on the Microsoft W32 API.
-   Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998,
-                 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+  2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -6348,12 +6349,14 @@
   x_underline_at_descent_line = 0;
 
   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.  */);
   Vx_toolkit_scroll_bars = Qt;
 
   staticpro (&last_mouse_motion_frame);
   last_mouse_motion_frame = Qnil;
 }
 
-/* arch-tag: 5fa70624-ab86-499c-8a85-473958ee4646
-   (do not change this comment) */

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2010-10-09 03:30:31 +0000
+++ b/src/xterm.c       2010-10-24 01:15:43 +0000
@@ -1,7 +1,8 @@
 /* X Communication module for terminals which understand the X protocol.
-   Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-                 Free Software Foundation, Inc.
+
+Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+  2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -10682,9 +10683,11 @@
   x_mouse_click_focus_ignore_position = 0;
 
   DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars,
-    doc: /* What X toolkit scroll bars Emacs uses.
-A value of nil means Emacs doesn't use X toolkit scroll bars.
-Otherwise, value is a symbol describing the X toolkit.  */);
+    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.  */);
 #ifdef USE_TOOLKIT_SCROLL_BARS
 #ifdef USE_MOTIF
   Vx_toolkit_scroll_bars = intern_c_string ("motif");
@@ -10750,5 +10753,3 @@
 
 #endif /* HAVE_X_WINDOWS */
 
-/* arch-tag: 6d4e4cb7-abc1-4302-9585-d84dcfb09d0f
-   (do not change this comment) */