aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Wohler2006-03-16 16:57:39 +0000
committerBill Wohler2006-03-16 16:57:39 +0000
commit486daaa504ab18287be24fa86a72d91b81fae564 (patch)
tree44df209161bfc30c717acab20e5a0ffafb11ec5d
parentc0696e1b955ce2f22821a28c33aeebda481b4419 (diff)
downloademacs-486daaa504ab18287be24fa86a72d91b81fae564.tar.gz
emacs-486daaa504ab18287be24fa86a72d91b81fae564.zip
(Defining Images): In image-load-path-for-library, prefer user's
images.
-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 1ea4a73365c..4dbe23d6edd 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,8 @@
12006-03-16 Bill Wohler <wohler@newt.com>
2
3 * display.texi (Defining Images): In image-load-path-for-library,
4 prefer user's images.
5
12006-03-15 Stefan Monnier <monnier@iro.umontreal.ca> 62006-03-15 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * modes.texi (Region to Fontify): Remove font-lock-lines-before. 8 * modes.texi (Region to Fontify): Remove font-lock-lines-before.
diff --git a/lispref/display.texi b/lispref/display.texi
index 649d2ca17a0..8b78b6a19ec 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -4130,10 +4130,11 @@ should specify the image as follows:
4130This function returns a suitable search path for images relative to 4130This function returns a suitable search path for images relative to
4131@var{library}. 4131@var{library}.
4132 4132
4133First it searches for @var{image} in a path suitable for 4133First it searches for @var{image} in @code{image-load-path} (excluding
4134@var{library}, which includes @file{../../etc/images} and 4134@file{@code{data-directory}/images}) and @code{load-path}, followed by
4135@file{../etc/images} relative to the library file itself, followed by 4135a path suitable for @var{library}, which includes
4136@code{image-load-path} and @code{load-path}. 4136@file{../../etc/images} and @file{../etc/images} relative to the
4137library file itself, and then in @file{@code{data-directory}/images}.
4137 4138
4138Then this function returns a list of directories which contains first 4139Then this function returns a list of directories which contains first
4139the directory in which @var{image} was found, followed by the value of 4140the directory in which @var{image} was found, followed by the value of