[Emacs-commit] emacs/lisp/mh-e mh-utils.el mh-letter.el mh-fol...

[Bill Wohler]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Bill Wohler <address@hidden>    06/03/15 17:03:58

Modified files:
        lisp/mh-e      : mh-utils.el mh-letter.el mh-folder.el mh-e.el 
                         mh-compat.el ChangeLog 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-utils.el.diff?tr1=1.62&tr2=1.63&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-letter.el.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-folder.el.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-e.el.diff?tr1=1.81&tr2=1.82&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/mh-compat.el.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/emacs/emacs/lisp/mh-e/ChangeLog.diff?tr1=1.181&tr2=1.182&r1=text&r2=text

Patches:
Index: emacs/lisp/mh-e/ChangeLog
diff -u emacs/lisp/mh-e/ChangeLog:1.181 emacs/lisp/mh-e/ChangeLog:1.182
--- emacs/lisp/mh-e/ChangeLog:1.181     Tue Mar 14 19:21:48 2006
+++ emacs/lisp/mh-e/ChangeLog   Wed Mar 15 17:03:58 2006
@@ -1,3 +1,18 @@
+2006-03-15  Bill Wohler  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mh-compat.el (mh-image-load-path-for-library): Incorporate
Index: emacs/lisp/mh-e/mh-compat.el
diff -u emacs/lisp/mh-e/mh-compat.el:1.12 emacs/lisp/mh-e/mh-compat.el:1.13
--- emacs/lisp/mh-e/mh-compat.el:1.12   Tue Mar 14 19:21:48 2006
+++ emacs/lisp/mh-e/mh-compat.el        Wed Mar 15 17:03:58 2006
@@ -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"))
Index: emacs/lisp/mh-e/mh-e.el
diff -u emacs/lisp/mh-e/mh-e.el:1.81 emacs/lisp/mh-e/mh-e.el:1.82
--- emacs/lisp/mh-e/mh-e.el:1.81        Tue Mar 14 19:21:48 2006
+++ emacs/lisp/mh-e/mh-e.el     Wed Mar 15 17:03:58 2006
@@ -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\".")
 
Index: emacs/lisp/mh-e/mh-folder.el
diff -u emacs/lisp/mh-e/mh-folder.el:1.9 emacs/lisp/mh-e/mh-folder.el:1.10
--- emacs/lisp/mh-e/mh-folder.el:1.9    Tue Mar 14 19:21:48 2006
+++ emacs/lisp/mh-e/mh-folder.el        Wed Mar 15 17:03:58 2006
@@ -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))
Index: emacs/lisp/mh-e/mh-letter.el
diff -u emacs/lisp/mh-e/mh-letter.el:1.10 emacs/lisp/mh-e/mh-letter.el:1.11
--- emacs/lisp/mh-e/mh-letter.el:1.10   Tue Mar 14 19:21:48 2006
+++ emacs/lisp/mh-e/mh-letter.el        Wed Mar 15 17:03:58 2006
@@ -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))
Index: emacs/lisp/mh-e/mh-utils.el
diff -u emacs/lisp/mh-e/mh-utils.el:1.62 emacs/lisp/mh-e/mh-utils.el:1.63
--- emacs/lisp/mh-e/mh-utils.el:1.62    Tue Mar 14 19:21:48 2006
+++ emacs/lisp/mh-e/mh-utils.el Wed Mar 15 17:03:58 2006
@@ -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