Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-9

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 16-33)

   - Update from CVS
   - Install ERC.
   - Fix ERC compiler warnings.
   - Use utf-8 encoding in ERC ChangeLogs.
   - Merge ERC-related Viper hacks into Viper.
   - Merge from erc--main--0
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 8-13)

   - Merge from emacs--devo--0
   - Update from CVS

4 files changed, 20 insertions, 5 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index ef07c950e09..2700e2f2261 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,18 @@
+2006-01-29  Chong Yidong  <cyd@stupidchicken.com>
+
+        * display.texi (Other Display Specs, Image Descriptors): Image
+        description is a list, not a cons cell.
+
+2006-01-28  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * lists.texi (Cons Cells): Minor correction (the cdr of a dotted
+        list is not necessarily a list).
+
+2006-01-27  Eli Zaretskii  <eliz@gnu.org>
+
+        * frames.texi (Layout Parameters): border-width and
+        internal-border-width belong to the frame, not the window.
+
 2006-01-19  Richard M. Stallman  <rms@gnu.org>
 
         * nonascii.texi (Translation of Characters): Search cmds use
diff --git a/lispref/display.texi b/lispref/display.texi
index 1bd10113ce9..0bb68bd4166 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -3280,7 +3280,7 @@ Display @var{string} instead of the text that has this property.
 Recursive display specifications are not supported---@var{string}'s
 @code{display} properties, if any, are not used.
 
-@item (image . @var{image-props})
+@item (image @var{image-props})
 This kind of display specification is an image descriptor (@pxref{Images}).
 When used as a display specification, it means to display the image
 instead of the text that has the display specification.
@@ -3508,7 +3508,7 @@ function always returns @code{t}; for other image types, it returns
 @cindex image descriptor
 
   An image description is a list of the form @code{(image
-. @var{props})}, where @var{props} is a property list containing
+@var{props})}, where @var{props} is a property list containing
 alternating keyword symbols (symbols whose names start with a colon) and
 their values.  You can use any Lisp object as a property, but the only
 properties that have any special meaning are certain symbols, all of
diff --git a/lispref/frames.texi b/lispref/frames.texi
index 3cb5e49dbac..4b967d8989c 100644
--- a/lispref/frames.texi
+++ b/lispref/frames.texi
@@ -466,10 +466,10 @@ frame, or control their sizes.
 
 @table @code
 @item border-width
-The width in pixels of the window border.
+The width in pixels of the frame's border.
 
 @item internal-border-width
-The distance in pixels between text and border.
+The distance in pixels between text and the frame's border.
 
 @item vertical-scroll-bars
 Whether the frame has scroll bars for vertical scrolling, and which side
diff --git a/lispref/lists.texi b/lispref/lists.texi
index 422c977184c..ef9220d2411 100644
--- a/lispref/lists.texi
+++ b/lispref/lists.texi
@@ -82,7 +82,7 @@ the end of a list enter infinite loops if given a circular list.
 @dfn{list structure} has come to mean any structure made out of cons
 cells.
 
-  The @sc{cdr} of any nonempty list @var{l} is a list containing all the
+  The @sc{cdr} of any nonempty true list @var{l} is a list containing all the
 elements of @var{l} except the first.
 
   @xref{Cons Cell Type}, for the read and print syntax of cons cells and