summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-01-28 12:37:07 -0500
committerChong Yidong <cyd@stupidchicken.com>2011-01-28 12:37:07 -0500
commitcfa7ac3f75ec2e612407469021d377035b4fe978 (patch)
tree864dccaba88664132bc6d1a9de51ee94e8144dae
parent2fae1748c84d5277757c8bbde9da2ed9a9c6a51e (diff)
downloademacs-cfa7ac3f75ec2e612407469021d377035b4fe978.tar.gz
Add two cindex entries to Lisp manual (Bug#7805).
* keymaps.texi (Defining Menus): Add "menu item" and "extended menu item" concept index entries.
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/keymaps.texi2
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7e6e7b41813..e4cc70f79bd 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-28 Chong Yidong <cyd@stupidchicken.com>
+
+ * keymaps.texi (Defining Menus): Add "menu item" and "extended
+ menu item" concept index entries (Bug#7805).
+
2011-01-23 Chong Yidong <cyd@stupidchicken.com>
Richard Kim <emacs18@gmail.com>
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index b267320840a..1763f3936c9 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -1974,6 +1974,7 @@ feature.
@cindex defining menus
@cindex menu prompt string
@cindex prompt string (of menu)
+@cindex menu item
A keymap acts as a menu if it has an @dfn{overall prompt string},
which is a string that appears as an element of the keymap.
@@ -2090,6 +2091,7 @@ the item strings themselves, since that is redundant.
@node Extended Menu Items
@subsubsection Extended Menu Items
@kindex menu-item
+@cindex extended menu item
An extended-format menu item is a more flexible and also cleaner
alternative to the simple format. You define an event type with a