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 355fa36e91aa76e95eb6d204ac4f535ca9645a6e..cd3c128c05d95eb003e6f50d730045ed55371b33 100644 (file)
--- 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 a4eb55c11358c5ca5c2fef60743e701ab8dc0742..fb16656f2eb714e11b7606f355f279fe8e439ccc 100644 (file)
--- 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))