diff options
| author | Glenn Morris | 2012-06-03 16:28:17 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-06-03 16:28:17 -0700 |
| commit | 0c3461de8684836598f5ef3d32161deb84df2443 (patch) | |
| tree | c169635069cccb6943b90e3c79de0f51367d080d /src | |
| parent | c71232db6e7a2dbd0cb0830829dcce8285ffa138 (diff) | |
| download | emacs-0c3461de8684836598f5ef3d32161deb84df2443.tar.gz emacs-0c3461de8684836598f5ef3d32161deb84df2443.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xdisp.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7f8a356eb71..e7a5b3bcc11 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-06-03 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (tool-bar-style): Doc fix. | ||
| 4 | |||
| 1 | 2012-06-03 Ulrich Müller <ulm@gentoo.org> | 5 | 2012-06-03 Ulrich Müller <ulm@gentoo.org> |
| 2 | 6 | ||
| 3 | * Makefile.in (PAXCTL): Define. | 7 | * 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 @@ | |||
| 1 | /* Display generation from window structure and buffer text. | 1 | /* Display generation from window structure and buffer text. |
| 2 | 2 | ||
| 3 | Copyright (C) 1985-1988, 1993-1995, 1997-2012 Free Software Foundation, Inc. | 3 | Copyright (C) 1985-1988, 1993-1995, 1997-2012 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
| @@ -28745,7 +28745,9 @@ It can be one of | |||
| 28745 | both - show both, text below image | 28745 | both - show both, text below image |
| 28746 | both-horiz - show text to the right of the image | 28746 | both-horiz - show text to the right of the image |
| 28747 | text-image-horiz - show text to the left of the image | 28747 | text-image-horiz - show text to the left of the image |
| 28748 | any other - use system default or image if no system default. */); | 28748 | any other - use system default or image if no system default. |
| 28749 | |||
| 28750 | This variable only affects the GTK+ toolkit version of Emacs. */); | ||
| 28749 | Vtool_bar_style = Qnil; | 28751 | Vtool_bar_style = Qnil; |
| 28750 | 28752 | ||
| 28751 | DEFVAR_INT ("tool-bar-max-label-size", tool_bar_max_label_size, | 28753 | DEFVAR_INT ("tool-bar-max-label-size", tool_bar_max_label_size, |