aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/lispref/ChangeLog6
-rw-r--r--doc/lispref/display.texi5
-rw-r--r--doc/lispref/elisp.texi5
-rw-r--r--doc/lispref/vol1.texi5
-rw-r--r--doc/lispref/vol2.texi5
5 files changed, 14 insertions, 12 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e4cc70f79bd..c651c5cab89 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,5 +1,11 @@
12011-01-28 Chong Yidong <cyd@stupidchicken.com> 12011-01-28 Chong Yidong <cyd@stupidchicken.com>
2 2
3 * vol1.texi (Top):
4 * vol2.texi (Top):
5 * elisp.texi (Top):
6 * display.texi (Display Property): Shorten the menu description of
7 the "Other Display Specs" node (Bug#7816).
8
3 * keymaps.texi (Defining Menus): Add "menu item" and "extended 9 * keymaps.texi (Defining Menus): Add "menu item" and "extended
4 menu item" concept index entries (Bug#7805). 10 menu item" concept index entries (Bug#7805).
5 11
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 0a9fa30c599..8a884401546 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -3657,9 +3657,8 @@ display specifications and what they mean.
3657* Replacing Specs:: Display specs that replace the text. 3657* Replacing Specs:: Display specs that replace the text.
3658* Specified Space:: Displaying one space with a specified width. 3658* Specified Space:: Displaying one space with a specified width.
3659* Pixel Specification:: Specifying space width or height in pixels. 3659* Pixel Specification:: Specifying space width or height in pixels.
3660* Other Display Specs:: Displaying an image; magnifying text; moving it 3660* Other Display Specs:: Displaying an image; adjusting the height,
3661 up or down on the page; adjusting the width 3661 spacing, and other properties of text.
3662 of spaces within text.
3663* Display Margins:: Displaying text or images to the side of the main text. 3662* Display Margins:: Displaying text or images to the side of the main text.
3664@end menu 3663@end menu
3665 3664
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 02cb2aeefc8..44161924188 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -1329,9 +1329,8 @@ The @code{display} Property
1329* Replacing Specs:: Display specs that replace the text. 1329* Replacing Specs:: Display specs that replace the text.
1330* Specified Space:: Displaying one space with a specified width. 1330* Specified Space:: Displaying one space with a specified width.
1331* Pixel Specification:: Specifying space width or height in pixels. 1331* Pixel Specification:: Specifying space width or height in pixels.
1332* Other Display Specs:: Displaying an image; magnifying text; moving it 1332* Other Display Specs:: Displaying an image; adjusting the height,
1333 up or down on the page; adjusting the width 1333 spacing, and other properties of text.
1334 of spaces within text.
1335* Display Margins:: Displaying text or images to the side of 1334* Display Margins:: Displaying text or images to the side of
1336 the main text. 1335 the main text.
1337 1336
diff --git a/doc/lispref/vol1.texi b/doc/lispref/vol1.texi
index 52c59d1e921..425e09fdc21 100644
--- a/doc/lispref/vol1.texi
+++ b/doc/lispref/vol1.texi
@@ -1350,9 +1350,8 @@ The @code{display} Property
1350* Replacing Specs:: Display specs that replace the text. 1350* Replacing Specs:: Display specs that replace the text.
1351* Specified Space:: Displaying one space with a specified width. 1351* Specified Space:: Displaying one space with a specified width.
1352* Pixel Specification:: Specifying space width or height in pixels. 1352* Pixel Specification:: Specifying space width or height in pixels.
1353* Other Display Specs:: Displaying an image; magnifying text; moving it 1353* Other Display Specs:: Displaying an image; adjusting the height,
1354 up or down on the page; adjusting the width 1354 spacing, and other properties of text.
1355 of spaces within text.
1356* Display Margins:: Displaying text or images to the side of 1355* Display Margins:: Displaying text or images to the side of
1357 the main text. 1356 the main text.
1358 1357
diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi
index 6a52860fc84..7d2f260c772 100644
--- a/doc/lispref/vol2.texi
+++ b/doc/lispref/vol2.texi
@@ -1349,9 +1349,8 @@ The @code{display} Property
1349* Replacing Specs:: Display specs that replace the text. 1349* Replacing Specs:: Display specs that replace the text.
1350* Specified Space:: Displaying one space with a specified width. 1350* Specified Space:: Displaying one space with a specified width.
1351* Pixel Specification:: Specifying space width or height in pixels. 1351* Pixel Specification:: Specifying space width or height in pixels.
1352* Other Display Specs:: Displaying an image; magnifying text; moving it 1352* Other Display Specs:: Displaying an image; adjusting the height,
1353 up or down on the page; adjusting the width 1353 spacing, and other properties of text.
1354 of spaces within text.
1355* Display Margins:: Displaying text or images to the side of 1354* Display Margins:: Displaying text or images to the side of
1356 the main text. 1355 the main text.
1357 1356