summaryrefslogtreecommitdiff
path: root/lisp/mh-e/mh-folder.el
diff options
context:
space:
mode:
authorBill Wohler <wohler@newt.com>2006-03-15 17:03:58 +0000
committerBill Wohler <wohler@newt.com>2006-03-15 17:03:58 +0000
commitf875b154b4dbaf7901c6bff923581197c1cf8ab5 (patch)
tree77346e2d712de5de186d04d8eaeb24a38c4d9499 /lisp/mh-e/mh-folder.el
parent713cb18dec3ee8f53fa987b50de7002c298f3170 (diff)
downloademacs-f875b154b4dbaf7901c6bff923581197c1cf8ab5.tar.gz
* mh-compat.el (mh-image-load-path-for-library): Fix example by not
recommending that one binds image-load-path. Just defvar it to placate compiler and only use it if previously defined. * mh-e.el (image-load-path): Don't bind! * mh-folder.el (mh-folder-mode): Only use image-load-path if previously defined. * mh-letter.el (mh-letter-mode): Ditto. * mh-utils.el (mh-logo-display): Ditto.
Diffstat (limited to 'lisp/mh-e/mh-folder.el')
-rw-r--r--lisp/mh-e/mh-folder.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index 2c32d1433f1..b1b8c7d859c 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -525,6 +525,7 @@ font-lock is done highlighting.")
(eval-when-compile
(defvar desktop-save-buffer)
(defvar font-lock-auto-fontify)
+ (defvar image-load-path)
(mh-do-in-xemacs (defvar font-lock-defaults)))
(defvar mh-folder-buttons-init-flag nil)
@@ -592,7 +593,9 @@ perform the operation on all messages in that region.
(mh-do-in-gnu-emacs
(unless mh-folder-buttons-init-flag
(let* ((load-path (mh-image-load-path-for-library "mh-e" "mh-logo.xpm"))
- (image-load-path (cons (car load-path) image-load-path)))
+ (image-load-path (cons (car load-path)
+ (when (boundp 'image-load-path)
+ image-load-path))))
(mh-tool-bar-folder-buttons-init)
(setq mh-folder-buttons-init-flag t)))
(set (make-local-variable 'tool-bar-map) mh-folder-tool-bar-map))