aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Ingebrigtsen2014-02-07 19:46:53 -0800
committerLars Ingebrigtsen2014-02-07 19:46:53 -0800
commitfff711eeb11f752c5cd84e6a9e4fc8af0f7563f5 (patch)
treeebe7f225b617a6b1928bbcff0d6ec64bc89ca977 /src
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 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/xdisp.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d5554989190..1615e194346 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12014-02-08 Lars Ingebrigtsen <larsi@gnus.org> 12014-02-08 Lars Ingebrigtsen <larsi@gnus.org>
2 2
3 * xdisp.c (syms_of_xdisp): Doc clarification (bug#15657).
4
3 * keyboard.c (Frecursive_edit): Say more precicely how throwing 5 * keyboard.c (Frecursive_edit): Say more precicely how throwing
4 `exit' works (bug#15865). 6 `exit' works (bug#15865).
5 7
diff --git a/src/xdisp.c b/src/xdisp.c
index 430551b2b68..d941c7b1086 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -30138,8 +30138,8 @@ Bind this around calls to `message' to let it take effect. */);
30138 DEFVAR_LISP ("menu-bar-update-hook", Vmenu_bar_update_hook, 30138 DEFVAR_LISP ("menu-bar-update-hook", Vmenu_bar_update_hook,
30139 doc: /* Normal hook run to update the menu bar definitions. 30139 doc: /* Normal hook run to update the menu bar definitions.
30140Redisplay runs this hook before it redisplays the menu bar. 30140Redisplay runs this hook before it redisplays the menu bar.
30141This is used to update submenus such as Buffers, 30141This is used to update menus such as Buffers, whose contents depend on
30142whose contents depend on various data. */); 30142various data. */);
30143 Vmenu_bar_update_hook = Qnil; 30143 Vmenu_bar_update_hook = Qnil;
30144 30144
30145 DEFVAR_LISP ("menu-updating-frame", Vmenu_updating_frame, 30145 DEFVAR_LISP ("menu-updating-frame", Vmenu_updating_frame,