[Emacs-diffs] /srv/bzr/emacs/trunk r110128: * frames.texi (Pop-Up Menus): Minor clarification for x-popup-menu.

[Chong Yidong]

------------------------------------------------------------
revno: 110128
fixes bug: http://debbugs.gnu.org/11148
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-09-22 11:29:37 +0800
message:
  * frames.texi (Pop-Up Menus): Minor clarification for x-popup-menu.
modified:
  doc/lispref/ChangeLog
  doc/lispref/frames.texi

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-09-21 03:22:27 +0000
+++ b/doc/lispref/ChangeLog     2012-09-22 03:29:37 +0000
@@ -1,3 +1,7 @@
+2012-09-22  Chong Yidong  <address@hidden>
+
+       * frames.texi (Pop-Up Menus): Minor clarification (Bug#11148).
+
 2012-09-21  Glenn Morris  <address@hidden>
 
        * debugging.texi (Using Debugger): Fix typo.

=== modified file 'doc/lispref/frames.texi'
--- a/doc/lispref/frames.texi   2012-05-27 01:34:14 +0000
+++ b/doc/lispref/frames.texi   2012-09-22 03:29:37 +0000
@@ -1773,10 +1773,12 @@
 (@var{title} @var{item1} @var{item2}...)
 @end example
 
-Each item should normally be a cons cell @code{(@var{line} . @var{value})},
-where @var{line} is a string, and @var{value} is the value to return if
-that @var{line} is chosen.  An item can also be a string; this makes a
-non-selectable line in the menu.
+Each @var{item} should be a cons cell, @code{(@var{line} . @var{value})},
+where @var{line} is a string and @var{value} is the value to return if
+that @var{line} is chosen.  Unlike in a menu keymap, a @code{nil}
address@hidden does not make the menu item non-selectable.
+Alternatively, each @var{item} can be a string rather than a cons
+cell; this makes a non-selectable menu item.
 
 If the user gets rid of the menu without making a valid choice, for
 instance by clicking the mouse away from a valid choice or by typing