Mercurial > emacs
changeset 80019:3eb16e4c4497
Merge from gnus--rel--5.10
Revision: emacs@sv.gnu.org/emacs--rel--22--patch-215
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 04 Feb 2008 09:42:16 +0000 |
| parents | 5bd0d726b8e7 |
| children | 5b2a1921a62f |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus.el |
| diffstat | 2 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Mon Feb 04 04:51:59 2008 +0000 +++ b/lisp/gnus/ChangeLog Mon Feb 04 09:42:16 2008 +0000 @@ -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)
--- a/lisp/gnus/gnus.el Mon Feb 04 04:51:59 2008 +0000 +++ b/lisp/gnus/gnus.el Mon Feb 04 09:42:16 2008 +0000 @@ -1001,6 +1001,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))