diff options
| author | Eli Zaretskii | 2000-12-08 17:08:25 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2000-12-08 17:08:25 +0000 |
| commit | 9ea8de1b79328baf1e3bfc92d75e8214ba5f0d05 (patch) | |
| tree | 863f7faf6e5a8f97c1d160be30459b43ddbf5b92 | |
| parent | ee8d23ee92c1ac862e452ee89b97dd5c7c00251f (diff) | |
| download | emacs-9ea8de1b79328baf1e3bfc92d75e8214ba5f0d05.tar.gz emacs-9ea8de1b79328baf1e3bfc92d75e8214ba5f0d05.zip | |
(create-image): Doc fix; spotted by Per Cederqvist <ceder@lysator.liu.se>.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/image.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3078e34d815..3df92519f03 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2000-12-08 Eli Zaretskii <eliz@is.elta.co.il> | ||
| 2 | |||
| 3 | * image.el (create-image): Doc fix; spotted by Per Cederqvist | ||
| 4 | <ceder@lysator.liu.se>. | ||
| 5 | |||
| 1 | 2000-12-08 Stefan Monnier <monnier@cs.yale.edu> | 6 | 2000-12-08 Stefan Monnier <monnier@cs.yale.edu> |
| 2 | 7 | ||
| 3 | * pcvs-defs.el (cvs-menu): Move. Make submenu for diff commands. | 8 | * pcvs-defs.el (cvs-menu): Move. Make submenu for diff commands. |
diff --git a/lisp/image.el b/lisp/image.el index ce2857ddd0e..b412a3359b2 100644 --- a/lisp/image.el +++ b/lisp/image.el | |||
| @@ -88,7 +88,7 @@ FILE-OR-DATA is an image file name or image data. | |||
| 88 | Optional TYPE is a symbol describing the image type. If TYPE is omitted | 88 | Optional TYPE is a symbol describing the image type. If TYPE is omitted |
| 89 | or nil, try to determine the image type from its first few bytes | 89 | or nil, try to determine the image type from its first few bytes |
| 90 | of image data. If that doesn't work, and FILE-OR-DATA is a file name, | 90 | of image data. If that doesn't work, and FILE-OR-DATA is a file name, |
| 91 | use its file extension.as image type. | 91 | use its file extension as image type. |
| 92 | Optional DATA-P non-nil means FILE-OR-DATA is a string containing image data. | 92 | Optional DATA-P non-nil means FILE-OR-DATA is a string containing image data. |
| 93 | Optional PROPS are additional image attributes to assign to the image, | 93 | Optional PROPS are additional image attributes to assign to the image, |
| 94 | like, e.g. `:mask MASK'. | 94 | like, e.g. `:mask MASK'. |