aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2006-01-29 16:59:57 +0000
committerChong Yidong2006-01-29 16:59:57 +0000
commitcf052abc708387f5adabe29a352611711bb2aebf (patch)
treec9a2c21f1c88cdf906966c50b770d8cb3f7e3601
parent708bf2320ade4b15f45e1586f5224b4739a7b984 (diff)
downloademacs-cf052abc708387f5adabe29a352611711bb2aebf.tar.gz
emacs-cf052abc708387f5adabe29a352611711bb2aebf.zip
* display.texi (Other Display Specs, Image Descriptors): Image
description is a list, not a cons cell.
-rw-r--r--lispref/ChangeLog5
-rw-r--r--lispref/display.texi4
2 files changed, 7 insertions, 2 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 3104465c2e6..2700e2f2261 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,8 @@
12006-01-29 Chong Yidong <cyd@stupidchicken.com>
2
3 * display.texi (Other Display Specs, Image Descriptors): Image
4 description is a list, not a cons cell.
5
12006-01-28 Luc Teirlinck <teirllm@auburn.edu> 62006-01-28 Luc Teirlinck <teirllm@auburn.edu>
2 7
3 * lists.texi (Cons Cells): Minor correction (the cdr of a dotted 8 * lists.texi (Cons Cells): Minor correction (the cdr of a dotted
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.
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.
@@ -3508,7 +3508,7 @@ function always returns @code{t}; for other image types, it returns
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
3511. @var{props})}, where @var{props} is a property list containing 3511@var{props})}, where @var{props} is a property list containing
3512alternating keyword symbols (symbols whose names start with a colon) and 3512alternating keyword symbols (symbols whose names start with a colon) and
3513their values. You can use any Lisp object as a property, but the only 3513their values. You can use any Lisp object as a property, but the only
3514properties that have any special meaning are certain symbols, all of 3514properties that have any special meaning are certain symbols, all of