[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100397: * frames.texi (Pop-Up Menus): Document where menu title comes from (Bug#7684).

[Chong Yidong]

------------------------------------------------------------
revno: 100397
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sat 2011-01-22 15:25:23 -0500
message:
  * frames.texi (Pop-Up Menus): Document where menu title comes from (Bug#7684).
modified:
  doc/lispref/ChangeLog
  doc/lispref/frames.texi

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2011-01-22 20:10:17 +0000
+++ b/doc/lispref/ChangeLog     2011-01-22 20:25:23 +0000
@@ -1,3 +1,8 @@
+2011-01-22  Chong Yidong  <address@hidden>
+
+       * frames.texi (Pop-Up Menus): Document where menu title comes
+       from (Bug#7684).
+
 2011-01-22  Glenn Morris  <address@hidden>
 
        * display.texi (Making Buttons): Mention limitation of text buttons.

=== modified file 'doc/lispref/frames.texi'
--- a/doc/lispref/frames.texi   2011-01-02 23:50:46 +0000
+++ b/doc/lispref/frames.texi   2011-01-22 20:25:23 +0000
@@ -1715,9 +1715,13 @@
 The argument @var{menu} says what to display in the menu.  It can be a
 keymap or a list of keymaps (@pxref{Menu Keymaps}).  In this case, the
 return value is the list of events corresponding to the user's choice.
-(This list has more than one element if the choice occurred in a
-submenu.)  Note that @code{x-popup-menu} does not actually execute the
-command bound to that sequence of events.
+This list has more than one element if the choice occurred in a
+submenu.  (Note that @code{x-popup-menu} does not actually execute the
+command bound to that sequence of events.)  On toolkits that support
+menu titles, the title is taken from the prompt string of @var{menu}
+if @var{menu} is a keymap, or from the prompt string of the first
+keymap in @var{menu} if it is a list of keymaps (@pxref{Defining
+Menus}).
 
 Alternatively, @var{menu} can have the following form: