* frames.texi (Pop-Up Menus): Minor clarification for x-popup-menu.

Fixes: debbugs:11148

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index c29b9e121291dba4a8d307baf427cf5acd2b211f..f1ae632267b7c3cd8d6674557c5c87b18ea1138c 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2012-09-22  Chong Yidong  <cyd@gnu.org>
+
+       * frames.texi (Pop-Up Menus): Minor clarification (Bug#11148).
+
 2012-09-21  Glenn Morris  <rgm@gnu.org>
 
        * debugging.texi (Using Debugger): Fix typo.

diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 22efcda18be4032d597aa8b5779b2dbef04baea0..356a891fbcd5ae6f475709ba9f223cbc2be74244 100644 (file)
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -1773,10 +1773,12 @@ where each pane is a list of form
 (@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}
+@var{value} 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