Mercurial > emacs
changeset 69492:6afc0d1f682b
* 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.
| author | Bill Wohler <wohler@newt.com> |
|---|---|
| date | Wed, 15 Mar 2006 17:03:58 +0000 |
| parents | 081473b824e0 |
| children | 4f9233243d97 |
| files | lisp/mh-e/ChangeLog lisp/mh-e/mh-compat.el lisp/mh-e/mh-e.el lisp/mh-e/mh-folder.el lisp/mh-e/mh-letter.el lisp/mh-e/mh-utils.el |
| diffstat | 6 files changed, 36 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mh-e/ChangeLog Wed Mar 15 11:20:34 2006 +0000 +++ b/lisp/mh-e/ChangeLog Wed Mar 15 17:03:58 2006 +0000 @@ -1,3 +1,18 @@ +2006-03-15 Bill Wohler <wohler@newt.com> + + * 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. + 2006-03-14 Bill Wohler <wohler@newt.com> * mh-compat.el (mh-image-load-path-for-library): Incorporate
--- a/lisp/mh-e/mh-compat.el Wed Mar 15 11:20:34 2006 +0000 +++ b/lisp/mh-e/mh-compat.el Wed Mar 15 17:03:58 2006 +0000 @@ -137,11 +137,13 @@ compatibility with versions of Emacs that lack the variable `image-load-path': - ;; Avoid errors on Emacsen without `image-load-path'. - (if (not (boundp 'image-load-path)) (defvar image-load-path nil)) + ;; Shush compiler. + (defvar image-load-path) (let* ((load-path (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))" (unless library (error "No library specified")) (unless image (error "No image specified"))
--- a/lisp/mh-e/mh-e.el Wed Mar 15 11:20:34 2006 +0000 +++ b/lisp/mh-e/mh-e.el Wed Mar 15 17:03:58 2006 +0000 @@ -325,9 +325,6 @@ ;; Etc. (alphabetical) -;; Avoid errors on Emacsen without image-load-path. -(if (not (boundp 'image-load-path)) (defvar image-load-path nil)) - (defvar mh-flists-present-flag nil "Non-nil means that we have \"flists\".")
--- a/lisp/mh-e/mh-folder.el Wed Mar 15 11:20:34 2006 +0000 +++ b/lisp/mh-e/mh-folder.el Wed Mar 15 17:03:58 2006 +0000 @@ -525,6 +525,7 @@ (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 @@ (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))
--- a/lisp/mh-e/mh-letter.el Wed Mar 15 11:20:34 2006 +0000 +++ b/lisp/mh-e/mh-letter.el Wed Mar 15 17:03:58 2006 +0000 @@ -278,7 +278,9 @@ (defvar mh-letter-buttons-init-flag nil) ;; Shush compiler. -(eval-when-compile (mh-do-in-xemacs (defvar font-lock-defaults))) +(eval-when-compile + (defvar image-load-path) + (mh-do-in-xemacs (defvar font-lock-defaults))) ;; Ensure new buffers won't get this mode if default-major-mode is nil. (put 'mh-letter-mode 'mode-class 'special) @@ -314,7 +316,9 @@ (mh-do-in-gnu-emacs (unless mh-letter-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-letter-buttons-init) (setq mh-letter-buttons-init-flag t))) (set (make-local-variable 'tool-bar-map) mh-letter-tool-bar-map))
--- a/lisp/mh-e/mh-utils.el Wed Mar 15 11:20:34 2006 +0000 +++ b/lisp/mh-e/mh-utils.el Wed Mar 15 17:03:58 2006 +0000 @@ -127,12 +127,17 @@ (defvar mh-logo-cache nil) +;; Shush compiler. +(defvar image-load-path) + ;;;###mh-autoload (defun mh-logo-display () "Modify mode line to display MH-E logo." (mh-do-in-gnu-emacs (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)))) (add-text-properties 0 2 `(display ,(or mh-logo-cache