[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-commit] emacs/lisp/mh-e mh-utils.el ChangeLog
From: |
Bill Wohler |
Subject: |
[Emacs-commit] emacs/lisp/mh-e mh-utils.el ChangeLog |
Date: |
Fri, 17 Feb 2006 18:36:03 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Branch:
Changes by: Bill Wohler <address@hidden> 06/02/17 18:36:03
Modified files:
lisp/mh-e : mh-utils.el ChangeLog
Log message:
(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).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-utils.el.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/ChangeLog.diff?tr1=1.152&tr2=1.153&r1=text&r2=text
Patches:
Index: emacs/lisp/mh-e/ChangeLog
diff -u emacs/lisp/mh-e/ChangeLog:1.152 emacs/lisp/mh-e/ChangeLog:1.153
--- emacs/lisp/mh-e/ChangeLog:1.152 Fri Feb 17 03:57:57 2006
+++ emacs/lisp/mh-e/ChangeLog Fri Feb 17 18:36:03 2006
@@ -1,3 +1,9 @@
+2006-02-17 Bill Wohler <address@hidden>
+
+ * 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 <address@hidden>
* mh-e.el (mh-inherit-face-flag): New variable. Non-nil means that
Index: emacs/lisp/mh-e/mh-utils.el
diff -u emacs/lisp/mh-e/mh-utils.el:1.51 emacs/lisp/mh-e/mh-utils.el:1.52
--- emacs/lisp/mh-e/mh-utils.el:1.51 Thu Feb 16 18:32:15 2006
+++ emacs/lisp/mh-e/mh-utils.el Fri Feb 17 18:36:03 2006
@@ -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))