Changes committed gnus/lisp (ChangeLog gnus.el)

Modified: ChangeLog gnus.el

(gnus-group-startup-message): Add `find-image' call before image-load-path is
let-bound.  Reported by Harald Hanche-Olsen <[email protected]>.


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1745 gnus/lisp/ChangeLog:7.1746
--- ChangeLog:7.1745	Fri Feb  1 07:44:02 2008
+++ ChangeLog	Sun Feb  3 14:50:50 2008
@@ -1,3 +1,9 @@
+2008-02-03  Reiner Steib  <[email protected]>
+
+	* gnus.el (gnus-group-startup-message): Add `find-image' call before
+	image-load-path is let-bound.  Reported by Harald Hanche-Olsen
+	<[email protected]>.
+
 2008-02-01  Katsumi Yamaoka  <[email protected]>
 
 	* gnus-art.el (gnus-article-describe-bindings): Work for draft group.
Index: gnus.el
diff -u gnus/lisp/gnus.el:7.77 gnus/lisp/gnus.el:7.78
--- gnus.el:7.77	Sun Jan 20 06:23:57 2008
+++ gnus.el	Sun Feb  3 14:50:50 2008
@@ -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))