diff options
| author | Miles Bader <miles@gnu.org> | 2008-02-04 09:42:16 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-02-04 09:42:16 +0000 |
| commit | cdd5307d74f1455ba1d681422fd6a6d53f90fd43 (patch) | |
| tree | f67e62ced0e2d0c6d47dd2207b59edd13de223a5 | |
| parent | 8e7e5143d9d3c4625846f58a905d4d6fc2c424ef (diff) | |
| download | emacs-cdd5307d74f1455ba1d681422fd6a6d53f90fd43.tar.gz | |
Merge from gnus--rel--5.10
Revision: emacs@sv.gnu.org/emacs--rel--22--patch-215
| -rw-r--r-- | lisp/gnus/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/gnus/gnus.el | 5 |
2 files changed, 11 insertions, 0 deletions
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)) |