aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2000-12-08 17:08:25 +0000
committerEli Zaretskii2000-12-08 17:08:25 +0000
commit9ea8de1b79328baf1e3bfc92d75e8214ba5f0d05 (patch)
tree863f7faf6e5a8f97c1d160be30459b43ddbf5b92
parentee8d23ee92c1ac862e452ee89b97dd5c7c00251f (diff)
downloademacs-9ea8de1b79328baf1e3bfc92d75e8214ba5f0d05.tar.gz
emacs-9ea8de1b79328baf1e3bfc92d75e8214ba5f0d05.zip
(create-image): Doc fix; spotted by Per Cederqvist <ceder@lysator.liu.se>.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/image.el2
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 @@
12000-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
12000-12-08 Stefan Monnier <monnier@cs.yale.edu> 62000-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.
88Optional TYPE is a symbol describing the image type. If TYPE is omitted 88Optional TYPE is a symbol describing the image type. If TYPE is omitted
89or nil, try to determine the image type from its first few bytes 89or nil, try to determine the image type from its first few bytes
90of image data. If that doesn't work, and FILE-OR-DATA is a file name, 90of image data. If that doesn't work, and FILE-OR-DATA is a file name,
91use its file extension.as image type. 91use its file extension as image type.
92Optional DATA-P non-nil means FILE-OR-DATA is a string containing image data. 92Optional DATA-P non-nil means FILE-OR-DATA is a string containing image data.
93Optional PROPS are additional image attributes to assign to the image, 93Optional PROPS are additional image attributes to assign to the image,
94like, e.g. `:mask MASK'. 94like, e.g. `:mask MASK'.