aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2005-09-18 14:03:55 +0000
committerChong Yidong2005-09-18 14:03:55 +0000
commit906320ec023f407eec55afa2df3532251056e8b8 (patch)
tree92691a59e2e52064d00133d42793838760997894
parent71773400ad7db4c5c1573b90ff64a082a88e1362 (diff)
downloademacs-906320ec023f407eec55afa2df3532251056e8b8.tar.gz
emacs-906320ec023f407eec55afa2df3532251056e8b8.zip
Updated documentation for `image-load-path'.
-rw-r--r--lispref/ChangeLog5
-rw-r--r--lispref/display.texi9
2 files changed, 10 insertions, 4 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index fd095d9a308..f86e9b54de5 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,8 @@
12005-09-18 Chong Yidong <cyd@stupidchicken.com>
2
3 * display.texi (Defining Images): Updated documentation for
4 `image-load-path'.
5
12005-09-17 Richard M. Stallman <rms@gnu.org> 62005-09-17 Richard M. Stallman <rms@gnu.org>
2 7
3 * display.texi (Defining Images): Clean up previous change. 8 * display.texi (Defining Images): Clean up previous change.
diff --git a/lispref/display.texi b/lispref/display.texi
index 0c36f421899..0d27a9b0edc 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -3952,9 +3952,10 @@ The image is looked for in @code{image-load-path}.
3952@defvar image-load-path 3952@defvar image-load-path
3953@tindex image-load-path 3953@tindex image-load-path
3954This variable's value is a list of locations in which to search for 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 3955image files. If an element is a string or a variable symbol whose
3956a directory to search. If an element is a variable symbol, the value 3956value is a string, the string is taken to be the name of a directory
3957of that variable is used as a list of directories to search. 3957to search. If an element is a variable symbol whose value is a list,
3958that is taken to be a list of directory names to search.
3958 3959
3959The default is to search in the @file{images} subdirectory of the 3960The default is to search in the @file{images} subdirectory of the
3960directory specified by @code{data-directory}, then the directory 3961directory specified by @code{data-directory}, then the directory
@@ -3962,7 +3963,7 @@ specified by @code{data-directory}, and finally in the directories in
3962@code{load-path}. Subdirectories are not automatically included in 3963@code{load-path}. Subdirectories are not automatically included in
3963the search, so if you put an image file in a subdirectory, you have to 3964the search, so if you put an image file in a subdirectory, you have to
3964supply the subdirectory name explicitly. For example, to find the 3965supply the subdirectory name explicitly. For example, to find the
3965image @file{images/foo/bar.xpm} within @code{data-directory} you 3966image @file{images/foo/bar.xpm} within @code{data-directory}, you
3966should specify the image as follows: 3967should specify the image as follows:
3967 3968
3968@example 3969@example