From: Luc Teirlinck <teirllm@auburn.edu>
Date: Fri, 17 Feb 2006 03:44:38 +0000 (+0000)
Subject: (Other Display Specs, Image Descriptors): Revert erroneous changes.
X-Git-Tag: emacs-pretest-22.0.90~4082
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0f5fe5ccbf3700b21d26af07d1d296be317b1073;p=emacs.git

(Other Display Specs, Image Descriptors): Revert erroneous changes.
The previous description of image-descriptors as `(image . PROPS)' was
correct.  (Pointed out by Johan Bockgård.)
---

diff --git a/lispref/display.texi b/lispref/display.texi
index c6bc63d2ff9..20b8df8d466 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.
@@ -3507,12 +3507,11 @@ function always returns @code{t}; for other image types, it returns
 @subsection Image Descriptors
 @cindex image descriptor
 
-  An image description is a list of the form @code{(image
-@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
-them keywords.
+  An image description is a list of the form @code{(image . @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 them keywords.
 
   Every image descriptor must contain the property @code{:type
 @var{type}} to specify the format of the image.  The value of @var{type}