diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-06-03 16:28:17 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-06-03 16:28:17 -0700 |
| commit | 0c3461de8684836598f5ef3d32161deb84df2443 (patch) | |
| tree | c169635069cccb6943b90e3c79de0f51367d080d | |
| parent | c71232db6e7a2dbd0cb0830829dcce8285ffa138 (diff) | |
| download | emacs-0c3461de8684836598f5ef3d32161deb84df2443.tar.gz | |
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.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/cus-start.el | 4 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 6 |
4 files changed, 15 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ba77c554ab6..e40fa7bb689 100644 --- 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 3ea5f41db55..c5f7f5b3d31 100644 --- 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 7f8a356eb71..e7a5b3bcc11 100644 --- 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 f01c86b2a07..06f6bf987fb 100644 --- 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, |