diff options
| author | Chong Yidong | 2006-01-29 16:59:57 +0000 |
|---|---|---|
| committer | Chong Yidong | 2006-01-29 16:59:57 +0000 |
| commit | cf052abc708387f5adabe29a352611711bb2aebf (patch) | |
| tree | c9a2c21f1c88cdf906966c50b770d8cb3f7e3601 /lispref | |
| parent | 708bf2320ade4b15f45e1586f5224b4739a7b984 (diff) | |
| download | emacs-cf052abc708387f5adabe29a352611711bb2aebf.tar.gz emacs-cf052abc708387f5adabe29a352611711bb2aebf.zip | |
* display.texi (Other Display Specs, Image Descriptors): Image
description is a list, not a cons cell.
Diffstat (limited to 'lispref')
| -rw-r--r-- | lispref/ChangeLog | 5 | ||||
| -rw-r--r-- | lispref/display.texi | 4 |
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 @@ | |||
| 1 | 2006-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 | |||
| 1 | 2006-01-28 Luc Teirlinck <teirllm@auburn.edu> | 6 | 2006-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. | |||
| 3280 | Recursive display specifications are not supported---@var{string}'s | 3280 | Recursive 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}) |
| 3284 | This kind of display specification is an image descriptor (@pxref{Images}). | 3284 | This kind of display specification is an image descriptor (@pxref{Images}). |
| 3285 | When used as a display specification, it means to display the image | 3285 | When used as a display specification, it means to display the image |
| 3286 | instead of the text that has the display specification. | 3286 | instead 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 |
| 3512 | alternating keyword symbols (symbols whose names start with a colon) and | 3512 | alternating keyword symbols (symbols whose names start with a colon) and |
| 3513 | their values. You can use any Lisp object as a property, but the only | 3513 | their values. You can use any Lisp object as a property, but the only |
| 3514 | properties that have any special meaning are certain symbols, all of | 3514 | properties that have any special meaning are certain symbols, all of |