procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(mh-image-load-path): Fix problem that images on load-path or

Browse source 
image-load-path would win over relative paths (newer MH-E or Emacs
distribution).
This commit is contained in:
Bill Wohler 2006-02-17 18:36:03 +00:00
parent 537407f049
commit 6e69a0bf12
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/mh-e/ChangeLog
View file

@ -1,3 +1,9 @@
2006-02-17 Bill Wohler <wohler@newt.com>
* mh-utils.el (mh-image-load-path): Fix problem that images on
load-path or image-load-path would win over relative paths (newer
MH-E or Emacs distribution).
2006-02-16 Bill Wohler <wohler@newt.com>
* mh-e.el (mh-inherit-face-flag): New variable. Non-nil means that

26
lisp/mh-e/mh-utils.el
View file

@ -111,18 +111,8 @@ already there.
See also variable `mh-image-load-path-called-flag'."
(unless mh-image-load-path-called-flag
(cond
(mh-image-load-path) ; user setting exists; we're done
((mh-image-search-load-path "mh-logo.xpm")
;; Images already in image-load-path.
(setq mh-image-load-path
(file-name-directory (mh-image-search-load-path "mh-logo.xpm"))))
((locate-library "mh-logo.xpm")
;; Images already in load-path.
(setq mh-image-load-path
(file-name-directory (locate-library "mh-logo.xpm"))))
(t
;; Guess `mh-image-load-path' if it wasn't provided by the user.
(let (mh-library-name)
(mh-image-load-path) ; user setting exists
((let (mh-library-name) ; try relative setting
;; First, find mh-e in the load-path.
(setq mh-library-name (locate-library "mh-e"))
(if (not mh-library-name)
@ -131,7 +121,17 @@ See also variable `mh-image-load-path-called-flag'."
(setq mh-image-load-path
(expand-file-name (concat
(file-name-directory mh-library-name)
"../../etc/images"))))))
"../../etc/images")))
(file-exists-p (expand-file-name "mh-logo.xpm" mh-image-load-path))))
((mh-image-search-load-path "mh-logo.xpm")
;; Images in image-load-path.
(setq mh-image-load-path
(file-name-directory (mh-image-search-load-path "mh-logo.xpm"))))
((locate-library "mh-logo.xpm")
;; Images in load-path.
(setq mh-image-load-path
(file-name-directory (locate-library "mh-logo.xpm")))))
(if (not (file-exists-p mh-image-load-path))
(error "Directory %s in mh-image-load-path does not exist"
mh-image-load-path))