Mercurial > emacs

changeset 68975:90801dac7d88

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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).
author Bill Wohler <wohler@newt.com>
date Fri, 17 Feb 2006 18:36:03 +0000
parents 977852fb2e3b
children 5c07e9043109
files lisp/mh-e/ChangeLog lisp/mh-e/mh-utils.el
diffstat 2 files changed, 19 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/mh-e/ChangeLog	Fri Feb 17 16:00:35 2006 +0000
+++ b/lisp/mh-e/ChangeLog	Fri Feb 17 18:36:03 2006 +0000
@@ -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
--- a/lisp/mh-e/mh-utils.el	Fri Feb 17 16:00:35 2006 +0000
+++ b/lisp/mh-e/mh-utils.el	Fri Feb 17 18:36:03 2006 +0000
@@ -111,18 +111,8 @@
 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 @@
         (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))