mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from emacs-23.

Browse source 
Note setting of CANNOT_DUMP on ia64 hpux is still to be merged manually.
This commit is contained in:
Glenn Morris 2011-01-24 19:47:47 -08:00
commit 06d8ace515
24 changed files with 242 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

10
doc/lispref/frames.texi
View file

@ -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: