aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/keymaps.texi3
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 94f3bb594bd..504a6d55837 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12013-11-10 Jan Djärv <jan.h.d@swipnet.se>
2
3 * keymaps.texi (Tool Bar): Mention that Gtk+/NS ignores item 1 to 3.
4
12013-11-09 Xue Fuqiao <xfq.free@gmail.com> 52013-11-09 Xue Fuqiao <xfq.free@gmail.com>
2 6
3 * os.texi (Startup Summary): Add an index about startup screen. 7 * os.texi (Startup Summary): Add an index about startup screen.
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 73d869d59fd..855420a70c9 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -2631,6 +2631,9 @@ Used when the item is disabled and deselected.
2631@end table 2631@end table
2632@end table 2632@end table
2633 2633
2634The GTK+ and NS versions of Emacs ignores items 1 to 3, because disabled and/or
2635deselected images are autocomputed from item 0.
2636
2634If @var{image} is a single image specification, Emacs draws the tool bar 2637If @var{image} is a single image specification, Emacs draws the tool bar
2635button in disabled state by applying an edge-detection algorithm to the 2638button in disabled state by applying an edge-detection algorithm to the
2636image. 2639image.