diff options
| -rw-r--r-- | doc/lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispref/keymaps.texi | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/xdisp.c | 4 |
4 files changed, 9 insertions, 3 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 @@ +2014-02-08 Lars Ingebrigtsen <larsi@gnus.org> + + * keymaps.texi (Menu Bar): Minor clarification (bug#15657). + 2014-02-06 Glenn Morris <rgm@gnu.org> * 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. @defvar menu-bar-update-hook This normal hook is run by redisplay to update the menu bar contents, -before redisplaying the menu bar. You can use it to update submenus +before redisplaying the menu bar. You can use it to update menus whose contents should vary. Since this hook is run frequently, we advise you to ensure that the functions it calls do not take much time in the usual case. diff --git a/src/ChangeLog b/src/ChangeLog index d5554989190..1615e194346 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2014-02-08 Lars Ingebrigtsen <larsi@gnus.org> + * xdisp.c (syms_of_xdisp): Doc clarification (bug#15657). + * keyboard.c (Frecursive_edit): Say more precicely how throwing `exit' works (bug#15865). 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. */); DEFVAR_LISP ("menu-bar-update-hook", Vmenu_bar_update_hook, doc: /* Normal hook run to update the menu bar definitions. Redisplay runs this hook before it redisplays the menu bar. -This is used to update submenus such as Buffers, -whose contents depend on various data. */); +This is used to update menus such as Buffers, whose contents depend on +various data. */); Vmenu_bar_update_hook = Qnil; DEFVAR_LISP ("menu-updating-frame", Vmenu_updating_frame, |