Mercurial > emacs
comparison lisp/gnus/gnus.el @ 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 | 1cb31606209f |
children |
comparison
equal
deleted
inserted
replaced
80018:5bd0d726b8e7 | 80019:3eb16e4c4497 |
---|---|
999 (erase-buffer) | 999 (erase-buffer) |
1000 (cond | 1000 (cond |
1001 ((and | 1001 ((and |
1002 (fboundp 'find-image) | 1002 (fboundp 'find-image) |
1003 (display-graphic-p) | 1003 (display-graphic-p) |
1004 ;; Make sure the library defining `image-load-path' is loaded | |
1005 ;; (`find-image' is autoloaded) (and discard the result). Else, we may | |
1006 ;; get "defvar ignored because image-load-path is let-bound" when calling | |
1007 ;; `find-image' below. | |
1008 (or (find-image '(nil (:type xpm :file "gnus.xpm"))) t) | |
1004 (let* ((data-directory (nnheader-find-etc-directory "images/gnus")) | 1009 (let* ((data-directory (nnheader-find-etc-directory "images/gnus")) |
1005 (image-load-path (cond (data-directory | 1010 (image-load-path (cond (data-directory |
1006 (list data-directory)) | 1011 (list data-directory)) |
1007 ((boundp 'image-load-path) | 1012 ((boundp 'image-load-path) |
1008 (symbol-value 'image-load-path)) | 1013 (symbol-value 'image-load-path)) |