tool-bar-style doc fixes

* lisp/cus-start.el (tool-bar-style, tool-bar-max-label-size): Fix :version.

* src/xdisp.c (tool-bar-style): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ba77c554ab69ab8824d80186941e3f2763964039..e40fa7bb689b9e575684a174e44af88613cd9e4b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-03  Glenn Morris  <rgm@gnu.org>
+
+       * cus-start.el (tool-bar-style, tool-bar-max-label-size):
+       Fix :version.
+
 2012-06-03  Stefan Merten  <smerten@oekonux.de>
 
        * textmodes/rst.el: Add comments.

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 3ea5f41db555dfb0ee458a05200971f1752c6d0c..c5f7f5b3d31edd56d3a451dd8afcc981a3997a9b 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -460,8 +460,8 @@ since it could result in memory overflow and make Emacs crash."
                      (const :tag "Both" :value both)
                      (const :tag "Both-horiz" :value both-horiz)
                      (const :tag "Text-image-horiz" :value text-image-horiz)
-                     (const :tag "System default" :value nil)) "23.3")
-             (tool-bar-max-label-size frames integer "23.3")
+                     (const :tag "System default" :value nil)) "24.1")
+             (tool-bar-max-label-size frames integer "24.1")
             (auto-hscroll-mode scrolling boolean "21.1")
             (void-text-area-pointer cursor
                                     (choice

diff --git a/src/ChangeLog b/src/ChangeLog
index 7f8a356eb712b7c89153f3d03edf35b40c990334..e7a5b3bcc114228efcbba2b50972f0ae01a4e8b8 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-03  Glenn Morris  <rgm@gnu.org>
+
+       * xdisp.c (tool-bar-style): Doc fix.
+
 2012-06-03  Ulrich Müller  <ulm@gentoo.org>
 
        * Makefile.in (PAXCTL): Define.

diff --git a/src/xdisp.c b/src/xdisp.c
index f01c86b2a071b1f387687fc06ec2cbb90509dfa5..06f6bf987fbcb9a6b223fbd2133ea32ffccc22af 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1,6 +1,6 @@
 /* Display generation from window structure and buffer text.
 
-Copyright (C) 1985-1988, 1993-1995, 1997-2012  Free Software Foundation, Inc.
+Copyright (C) 1985-1988, 1993-1995, 1997-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -28745,7 +28745,9 @@ It can be one of
  both             - show both, text below image
  both-horiz       - show text to the right of the image
  text-image-horiz - show text to the left of the image
- any other        - use system default or image if no system default.  */);
+ any other        - use system default or image if no system default.
+
+This variable only affects the GTK+ toolkit version of Emacs.  */);
   Vtool_bar_style = Qnil;
 
   DEFVAR_INT ("tool-bar-max-label-size", tool_bar_max_label_size,