diff options
| author | Glenn Morris <[email protected]> | 2011-01-24 19:47:47 -0800 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2011-01-24 19:47:47 -0800 |
| commit | 06d8ace51597cd41e110560a56a1abeb6cce23d6 (patch) | |
| tree | e893bab169f27821637fc07e3cd2414b4b9b7b68 /doc/lispref/frames.texi | |
| parent | c5ecc7690d4afafb42049634d64abd781ff76642 (diff) | |
| parent | 0d19d4feaa653a315853716e64bbaddb210a26ca (diff) | |
Merge from emacs-23.
Note setting of CANNOT_DUMP on ia64 hpux is still to be merged manually.
Diffstat (limited to 'doc/lispref/frames.texi')
| -rw-r--r-- | doc/lispref/frames.texi | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 0d83aadbcd..c4e7479841 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -1791,9 +1791,13 @@ without actually displaying or popping up the menu. 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: |