diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-01-22 15:25:23 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-01-22 15:25:23 -0500 |
| commit | 28a881534e2dcc072d731f562f1bb244e5fafaea (patch) | |
| tree | 44188d9719a3b91f4f62f5d914e372d8a4b588e5 | |
| parent | 4d265b4d767984d643db79cd17ec74785b20dc2a (diff) | |
| download | emacs-28a881534e2dcc072d731f562f1bb244e5fafaea.tar.gz | |
* frames.texi (Pop-Up Menus): Document where menu title comes from (Bug#7684).
| -rw-r--r-- | doc/lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/lispref/frames.texi | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index f81a3069f80..b0c80eba2f9 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2011-01-22 Chong Yidong <cyd@stupidchicken.com> + + * frames.texi (Pop-Up Menus): Document where menu title comes + from (Bug#7684). + 2011-01-22 Glenn Morris <rgm@gnu.org> * display.texi (Making Buttons): Mention limitation of text buttons. diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 6aade20d2f2..a99782b95e1 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -1715,9 +1715,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: |