Merge changes from emacs-23 branch

6 files changed, 21 insertions, 12 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index be8803d4cb2..063ea78c09a 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-28  Chong Yidong  <cyd@stupidchicken.com>
+
+        * vol1.texi (Top):
+        * vol2.texi (Top):
+        * elisp.texi (Top):
+        * display.texi (Display Property): Shorten the menu description of
+        the "Other Display Specs" node (Bug#7816).
+
+        * keymaps.texi (Defining Menus): Add "menu item" and "extended
+        menu item" concept index entries (Bug#7805).
+
 2011-01-29  Eli Zaretskii  <eliz@gnu.org>
 
         * makefile.w32-in (texinfodir): New variable.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 9bc80a77742..80a035aa346 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -3657,9 +3657,8 @@ display specifications and what they mean.
 * Replacing Specs::      Display specs that replace the text.
 * Specified Space::      Displaying one space with a specified width.
 * Pixel Specification::  Specifying space width or height in pixels.
-* Other Display Specs::  Displaying an image; magnifying text; moving it
-                          up or down on the page; adjusting the width
-                          of spaces within text.
+* Other Display Specs::     Displaying an image; adjusting the height,
+                              spacing, and other properties of text.
 * Display Margins::     Displaying text or images to the side of the main text.
 @end menu
 
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 0214bb9d10c..ad7931d45b4 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -1330,9 +1330,8 @@ The @code{display} Property
 * Replacing Specs::         Display specs that replace the text.
 * Specified Space::         Displaying one space with a specified width.
 * Pixel Specification::     Specifying space width or height in pixels.
-* Other Display Specs::     Displaying an image; magnifying text; moving it
-                              up or down on the page; adjusting the width
-                              of spaces within text.
+* Other Display Specs::     Displaying an image; adjusting the height,
+                              spacing, and other properties of text.
 * Display Margins::         Displaying text or images to the side of
                               the main text.
 
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index a9a30abd1ed..4a2964b9b6c 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -1972,6 +1972,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.
@@ -2073,6 +2074,7 @@ of menus in advance.  To force recalculation of the menu bar, call
 @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
diff --git a/doc/lispref/vol1.texi b/doc/lispref/vol1.texi
index 93e6cc31ec2..ad8ff0819ca 100644
--- a/doc/lispref/vol1.texi
+++ b/doc/lispref/vol1.texi
@@ -1351,9 +1351,8 @@ The @code{display} Property
 * Replacing Specs::         Display specs that replace the text.
 * Specified Space::         Displaying one space with a specified width.
 * Pixel Specification::     Specifying space width or height in pixels.
-* Other Display Specs::     Displaying an image; magnifying text; moving it
-                              up or down on the page; adjusting the width
-                              of spaces within text.
+* Other Display Specs::     Displaying an image; adjusting the height,
+                              spacing, and other properties of text.
 * Display Margins::         Displaying text or images to the side of
                               the main text.
 
diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi
index 6833e5219f3..7832b3a8614 100644
--- a/doc/lispref/vol2.texi
+++ b/doc/lispref/vol2.texi
@@ -1350,9 +1350,8 @@ The @code{display} Property
 * Replacing Specs::         Display specs that replace the text.
 * Specified Space::         Displaying one space with a specified width.
 * Pixel Specification::     Specifying space width or height in pixels.
-* Other Display Specs::     Displaying an image; magnifying text; moving it
-                              up or down on the page; adjusting the width
-                              of spaces within text.
+* Other Display Specs::     Displaying an image; adjusting the height,
+                              spacing, and other properties of text.
 * Display Margins::         Displaying text or images to the side of
                               the main text.