aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Teirlinck2006-02-17 03:44:38 +0000
committerLuc Teirlinck2006-02-17 03:44:38 +0000
commit0f5fe5ccbf3700b21d26af07d1d296be317b1073 (patch)
tree125852c20ebfbcd03122a731e8f43ba3c362e1f1
parentb6498a68f32652a4846a2ca36b8099b541ce8a0a (diff)
downloademacs-0f5fe5ccbf3700b21d26af07d1d296be317b1073.tar.gz
emacs-0f5fe5ccbf3700b21d26af07d1d296be317b1073.zip
(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.)
-rw-r--r--lispref/display.texi13
1 files changed, 6 insertions, 7 deletions
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.
3280Recursive display specifications are not supported---@var{string}'s 3280Recursive display specifications are not supported---@var{string}'s
3281@code{display} properties, if any, are not used. 3281@code{display} properties, if any, are not used.
3282 3282
3283@item (image @var{image-props}) 3283@item (image . @var{image-props})
3284This kind of display specification is an image descriptor (@pxref{Images}). 3284This kind of display specification is an image descriptor (@pxref{Images}).
3285When used as a display specification, it means to display the image 3285When used as a display specification, it means to display the image
3286instead of the text that has the display specification. 3286instead of the text that has the display specification.
@@ -3507,12 +3507,11 @@ function always returns @code{t}; for other image types, it returns
3507@subsection Image Descriptors 3507@subsection Image Descriptors
3508@cindex image descriptor 3508@cindex image descriptor
3509 3509
3510 An image description is a list of the form @code{(image 3510 An image description is a list of the form @code{(image . @var{props})},
3511@var{props})}, where @var{props} is a property list containing 3511where @var{props} is a property list containing alternating keyword
3512alternating keyword symbols (symbols whose names start with a colon) and 3512symbols (symbols whose names start with a colon) and their values.
3513their values. You can use any Lisp object as a property, but the only 3513You can use any Lisp object as a property, but the only properties
3514properties that have any special meaning are certain symbols, all of 3514that have any special meaning are certain symbols, all of them keywords.
3515them keywords.
3516 3515
3517 Every image descriptor must contain the property @code{:type 3516 Every image descriptor must contain the property @code{:type
3518@var{type}} to specify the format of the image. The value of @var{type} 3517@var{type}} to specify the format of the image. The value of @var{type}