diff lisp/gnus/gnus.el @ 91506:ab078721fd90

Merge from gnus--devo--0 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1047
author Miles Bader <miles@gnu.org>
date Mon, 04 Feb 2008 09:38:49 +0000
parents 107ccd98fa12
children 5f827896103e
line wrap: on
line diff
--- a/lisp/gnus/gnus.el	Mon Feb 04 09:38:39 2008 +0000
+++ b/lisp/gnus/gnus.el	Mon Feb 04 09:38:49 2008 +0000
@@ -1003,6 +1003,11 @@
    ((and
      (fboundp 'find-image)
      (display-graphic-p)
+     ;; Make sure the library defining `image-load-path' is loaded
+     ;; (`find-image' is autoloaded) (and discard the result).  Else, we may
+     ;; get "defvar ignored because image-load-path is let-bound" when calling
+     ;; `find-image' below.
+     (or (find-image '(nil (:type xpm :file "gnus.xpm"))) t)
      (let* ((data-directory (nnheader-find-etc-directory "images/gnus"))
 	    (image-load-path (cond (data-directory
 				    (list data-directory))