[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108472: tool-bar-style doc fixes
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108472: tool-bar-style doc fixes |
Date: |
Sun, 03 Jun 2012 16:28:17 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108472
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2012-06-03 16:28:17 -0700
message:
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.
modified:
lisp/ChangeLog
lisp/cus-start.el
src/ChangeLog
src/xdisp.c
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-06-03 17:20:24 +0000
+++ b/lisp/ChangeLog 2012-06-03 23:28:17 +0000
@@ -1,3 +1,8 @@
+2012-06-03 Glenn Morris <address@hidden>
+
+ * cus-start.el (tool-bar-style, tool-bar-max-label-size):
+ Fix :version.
+
2012-06-03 Stefan Merten <address@hidden>
* textmodes/rst.el: Add comments.
=== modified file 'lisp/cus-start.el'
--- a/lisp/cus-start.el 2012-05-25 10:31:18 +0000
+++ b/lisp/cus-start.el 2012-06-03 23:28:17 +0000
@@ -460,8 +460,8 @@
(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
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-06-03 23:14:22 +0000
+++ b/src/ChangeLog 2012-06-03 23:28:17 +0000
@@ -1,3 +1,7 @@
+2012-06-03 Glenn Morris <address@hidden>
+
+ * xdisp.c (tool-bar-style): Doc fix.
+
2012-06-03 Ulrich Müller <address@hidden>
* Makefile.in (PAXCTL): Define.
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2012-06-03 10:23:49 +0000
+++ b/src/xdisp.c 2012-06-03 23:28:17 +0000
@@ -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 @@
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,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108472: tool-bar-style doc fixes,
Glenn Morris <=