From: Bill Wohler <wohler@newt.com>
Date: Fri, 17 Feb 2006 18:36:03 +0000 (+0000)
Subject: (mh-image-load-path): Fix problem that images on load-path or
X-Git-Tag: emacs-pretest-22.0.90~4058
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6e69a0bf121e54b43726d814221c701ba82c797b;p=emacs.git

(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).
---

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index e5262693d8a..93747386cd3 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -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
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 58d29bc5d1c..afb52284ec9 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -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))