Merge from emacs-23.

Note setting of CANNOT_DUMP on ia64 hpux is still to be merged manually.

1 files changed, 7 insertions, 3 deletions

diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 0d83aadbcd2..c4e74798415 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: