From: Miles Bader <miles@gnu.org>
Date: Mon, 4 Feb 2008 09:42:16 +0000 (+0000)
Subject: Merge from gnus--rel--5.10
X-Git-Tag: emacs-pretest-22.1.91~85
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cdd5307d74f1455ba1d681422fd6a6d53f90fd43;p=emacs.git

Merge from gnus--rel--5.10

Revision: emacs@sv.gnu.org/emacs--rel--22--patch-215
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 355fa36e91a..cd3c128c05d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-03  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus.el (gnus-group-startup-message): Add `find-image' call before
+	image-load-path is let-bound.  Reported by Harald Hanche-Olsen
+	<hanche@math.ntnu.no>.
+
 2008-01-12  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* gnus-sum.el (gnus-article-sort-by-random)
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index a4eb55c1135..fb16656f2eb 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1001,6 +1001,11 @@ be set in `.emacs' instead."
    ((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))