aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorLars Ingebrigtsen2014-02-07 19:46:53 -0800
committerLars Ingebrigtsen2014-02-07 19:46:53 -0800
commitfff711eeb11f752c5cd84e6a9e4fc8af0f7563f5 (patch)
treeebe7f225b617a6b1928bbcff0d6ec64bc89ca977 /doc
parent1bde5c3b08d1de9b2c9cd38728bcd35329455a8c (diff)
downloademacs-fff711eeb11f752c5cd84e6a9e4fc8af0f7563f5.tar.gz
emacs-fff711eeb11f752c5cd84e6a9e4fc8af0f7563f5.zip
* doc/lispref/keymaps.texi (Menu Bar): Minor clarification.
* src/xdisp.c (syms_of_xdisp): Doc clarification (bug#15657).
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/keymaps.texi2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index eff328caa60..139e20a6189 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12014-02-08 Lars Ingebrigtsen <larsi@gnus.org>
2
3 * keymaps.texi (Menu Bar): Minor clarification (bug#15657).
4
12014-02-06 Glenn Morris <rgm@gnu.org> 52014-02-06 Glenn Morris <rgm@gnu.org>
2 6
3 * display.texi (Truncation): 7 * display.texi (Truncation):
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index d81067eed31..a372cecb818 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -2559,7 +2559,7 @@ at the end of the menu bar, following local menu items.
2559 2559
2560@defvar menu-bar-update-hook 2560@defvar menu-bar-update-hook
2561This normal hook is run by redisplay to update the menu bar contents, 2561This normal hook is run by redisplay to update the menu bar contents,
2562before redisplaying the menu bar. You can use it to update submenus 2562before redisplaying the menu bar. You can use it to update menus
2563whose contents should vary. Since this hook is run frequently, we 2563whose contents should vary. Since this hook is run frequently, we
2564advise you to ensure that the functions it calls do not take much time 2564advise you to ensure that the functions it calls do not take much time
2565in the usual case. 2565in the usual case.