[Emacs-diffs] Changes to emacs/lisp/image.el

[Bill Wohler]

Index: emacs/lisp/image.el
diff -u emacs/lisp/image.el:1.58 emacs/lisp/image.el:1.59
--- emacs/lisp/image.el:1.58    Tue Mar 14 19:16:24 2006
+++ emacs/lisp/image.el Wed Mar 15 17:06:16 2006
@@ -99,11 +99,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"))