From: Glenn Morris <rgm@gnu.org>
Date: Wed, 22 Aug 2007 07:50:47 +0000 (+0000)
Subject: (create-image): Doc fix.
X-Git-Tag: emacs-pretest-23.0.90~11398
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2467875c22ef63bc82b9a25eb7d4131a6511fc95;p=emacs.git

(create-image): Doc fix.
---

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,
 like, e.g. `:mask MASK'.
 Value is the image created, or nil if images of type TYPE are not supported.
 
-Images should not be larger than specified by `max-image-size'."
+Images should not be larger than specified by `max-image-size'.
+
+Image file names that are not absolute are searched for in the
+\"images\" sub-directory of `data-directory' and
+`x-bitmap-file-path' (in that order)."
+  ;; It is x_find_image_file in image.c that sets the search path.
   (setq type (image-type file-or-data type data-p))
   (when (image-type-available-p type)
     (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 @@
+2007-08-22  Glenn Morris  <rgm@gnu.org>
+
+	* image.c (x_find_image_file): Search in etc/images/ rather than
+	etc/.
+
 2007-08-22  Paul Pogonyshev  <pogonyshev@gmx.net>
 
 	* Makefile.in (ALL_CFLAGS, LIBX): Add RSVG_LIBS.