Mercurial > emacs
changeset 69517:a1a937e48976
(Defining Images): In image-load-path-for-library, prefer user's
images.
| author | Bill Wohler <wohler@newt.com> |
|---|---|
| date | Thu, 16 Mar 2006 16:57:39 +0000 |
| parents | e419733d5cf6 |
| children | 2f7238ff01ad |
| files | lispref/ChangeLog lispref/display.texi |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lispref/ChangeLog Thu Mar 16 16:55:26 2006 +0000 +++ b/lispref/ChangeLog Thu Mar 16 16:57:39 2006 +0000 @@ -1,3 +1,8 @@ +2006-03-16 Bill Wohler <wohler@newt.com> + + * display.texi (Defining Images): In image-load-path-for-library, + prefer user's images. + 2006-03-15 Stefan Monnier <monnier@iro.umontreal.ca> * modes.texi (Region to Fontify): Remove font-lock-lines-before.
--- a/lispref/display.texi Thu Mar 16 16:55:26 2006 +0000 +++ b/lispref/display.texi Thu Mar 16 16:57:39 2006 +0000 @@ -4130,10 +4130,11 @@ This function returns a suitable search path for images relative to @var{library}. -First it searches for @var{image} in a path suitable for -@var{library}, which includes @file{../../etc/images} and -@file{../etc/images} relative to the library file itself, followed by -@code{image-load-path} and @code{load-path}. +First it searches for @var{image} in @code{image-load-path} (excluding +@file{@code{data-directory}/images}) and @code{load-path}, followed by +a path suitable for @var{library}, which includes +@file{../../etc/images} and @file{../etc/images} relative to the +library file itself, and then in @file{@code{data-directory}/images}. Then this function returns a list of directories which contains first the directory in which @var{image} was found, followed by the value of