diff options
| author | Glenn Morris | 2007-08-22 07:50:47 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-08-22 07:50:47 +0000 |
| commit | 2467875c22ef63bc82b9a25eb7d4131a6511fc95 (patch) | |
| tree | bc7390133e17991ffd93c5ea8a03b419e7a33870 | |
| parent | 38f37c0fdb9e801cbeef4bc9c0bae6e8c44eb2da (diff) | |
| download | emacs-2467875c22ef63bc82b9a25eb7d4131a6511fc95.tar.gz emacs-2467875c22ef63bc82b9a25eb7d4131a6511fc95.zip | |
(create-image): Doc fix.
| -rw-r--r-- | lisp/image.el | 7 | ||||
| -rw-r--r-- | src/ChangeLog | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/image.el b/lisp/image.el index d63c69cafed..e00a50ddc03 100644 --- a/lisp/image.el +++ b/lisp/image.el | |||
| @@ -353,7 +353,12 @@ Optional PROPS are additional image attributes to assign to the image, | |||
| 353 | like, e.g. `:mask MASK'. | 353 | like, e.g. `:mask MASK'. |
| 354 | Value is the image created, or nil if images of type TYPE are not supported. | 354 | Value is the image created, or nil if images of type TYPE are not supported. |
| 355 | 355 | ||
| 356 | Images should not be larger than specified by `max-image-size'." | 356 | Images should not be larger than specified by `max-image-size'. |
| 357 | |||
| 358 | Image file names that are not absolute are searched for in the | ||
| 359 | \"images\" sub-directory of `data-directory' and | ||
| 360 | `x-bitmap-file-path' (in that order)." | ||
| 361 | ;; It is x_find_image_file in image.c that sets the search path. | ||
| 357 | (setq type (image-type file-or-data type data-p)) | 362 | (setq type (image-type file-or-data type data-p)) |
| 358 | (when (image-type-available-p type) | 363 | (when (image-type-available-p type) |
| 359 | (append (list 'image :type type (if data-p :data :file) file-or-data) | 364 | (append (list 'image :type type (if data-p :data :file) file-or-data) |
diff --git a/src/ChangeLog b/src/ChangeLog index e9095f195c2..c57e6174632 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2007-08-22 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * image.c (x_find_image_file): Search in etc/images/ rather than | ||
| 4 | etc/. | ||
| 5 | |||
| 1 | 2007-08-22 Paul Pogonyshev <pogonyshev@gmx.net> | 6 | 2007-08-22 Paul Pogonyshev <pogonyshev@gmx.net> |
| 2 | 7 | ||
| 3 | * Makefile.in (ALL_CFLAGS, LIBX): Add RSVG_LIBS. | 8 | * Makefile.in (ALL_CFLAGS, LIBX): Add RSVG_LIBS. |