aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2005-09-15 14:02:34 +0000
committerChong Yidong2005-09-15 14:02:34 +0000
commit5b51c03716d7c487d1c2336df2a76a6417a2343c (patch)
treed3d3f03db74bd66fbf2cca1aefdb8ea9db3b2bc4
parent979f56ac3e4d931ae16461626db304fdb7bb139f (diff)
downloademacs-5b51c03716d7c487d1c2336df2a76a6417a2343c.tar.gz
emacs-5b51c03716d7c487d1c2336df2a76a6417a2343c.zip
Document `image-load-path'.
-rw-r--r--lispref/ChangeLog4
-rw-r--r--lispref/display.texi23
2 files changed, 25 insertions, 2 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 82cfcab4699..3252e671c11 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,7 @@
12005-09-15 Chong Yidong <cyd@stupidchicken.com>
2
3 * display.texi (Defining Images): Document `image-load-path'.
4
12005-09-15 Richard M. Stallman <rms@gnu.org> 52005-09-15 Richard M. Stallman <rms@gnu.org>
2 6
3 * objects.texi (Printed Representation): Minor cleanup. 7 * objects.texi (Printed Representation): Minor cleanup.
diff --git a/lispref/display.texi b/lispref/display.texi
index b6348800fad..96aa2335a6a 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -3946,10 +3946,29 @@ The first specification in the list whose @var{type} is supported, and
3946@var{file} exists, is used to construct the image specification to be 3946@var{file} exists, is used to construct the image specification to be
3947returned. If no specification is satisfied, @code{nil} is returned. 3947returned. If no specification is satisfied, @code{nil} is returned.
3948 3948
3949The image is looked for first on @code{load-path} and then in 3949The image is looked for in @code{image-load-path}.
3950@code{data-directory}.
3951@end defun 3950@end defun
3952 3951
3952@defvar image-load-path
3953@tindex image-load-path
3954This variable's value is a list of locations in which to search for
3955image files. If an element is a string, it is taken to be the name of
3956a directory to search. If an element is a variable symbol, the value
3957of that variable is used as a list of directories to search.
3958
3959The default is to search in @file{@code{data-directory}/images}, then
3960in @code{data-directory}, and finally in the directories specified by
3961@code{load-path}. Subdirectories are not automatically included in
3962the search, so if you put an image file in a subdirectory, you have to
3963supply the subdirectory name explicitly. For example, if you put an
3964image file @file{bar.xpm} in @file{@code{data-directory}/images/foo/},
3965you should define the image as:
3966
3967@example
3968 (defimage foo-image '((:type xpm :file "foo/bar.xpm")))
3969@end example
3970@end defvar
3971
3953@node Showing Images 3972@node Showing Images
3954@subsection Showing Images 3973@subsection Showing Images
3955 3974