[Emacs-diffs] trunk r116319: * doc/lispref/keymaps.texi (Menu Bar): Minor clarification.

[Lars Ingebrigtsen]

------------------------------------------------------------
revno: 116319
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15657
committer: Lars Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Fri 2014-02-07 19:46:53 -0800
message:
  * doc/lispref/keymaps.texi (Menu Bar): Minor clarification.
  
  * src/xdisp.c (syms_of_xdisp): Doc clarification (bug#15657).
modified:
  doc/lispref/ChangeLog          changelog-20091113204419-o5vbwnq5f7feedwu-6155
  doc/lispref/keymaps.texi       
keymaps.texi-20091113204419-o5vbwnq5f7feedwu-6190
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2014-02-06 04:27:26 +0000
+++ b/doc/lispref/ChangeLog     2014-02-08 03:46:53 +0000
@@ -1,3 +1,7 @@
+2014-02-08  Lars Ingebrigtsen  <address@hidden>
+
+       * keymaps.texi (Menu Bar): Minor clarification (bug#15657).
+
 2014-02-06  Glenn Morris  <address@hidden>
 
        * display.texi (Truncation):

=== modified file 'doc/lispref/keymaps.texi'
--- a/doc/lispref/keymaps.texi  2014-01-01 07:43:34 +0000
+++ b/doc/lispref/keymaps.texi  2014-02-08 03:46:53 +0000
@@ -2559,7 +2559,7 @@
 
 @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.

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-02-08 03:29:47 +0000
+++ b/src/ChangeLog     2014-02-08 03:46:53 +0000
@@ -1,5 +1,7 @@
 2014-02-08  Lars Ingebrigtsen  <address@hidden>
 
+       * xdisp.c (syms_of_xdisp): Doc clarification (bug#15657).
+
        * keyboard.c (Frecursive_edit): Say more precicely how throwing
        `exit' works (bug#15865).
 

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2014-02-07 09:32:15 +0000
+++ b/src/xdisp.c       2014-02-08 03:46:53 +0000
@@ -30138,8 +30138,8 @@
   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,