Synch to No Gnus 200504221124.

[elisp/gnus.git-] / lisp / gnus.el

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 211b06a..d8b38fc 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -321,7 +321,8 @@ be set in `.emacs' instead."
   (defvar gnus-mode-line-image-cache t)
   (if (fboundp 'find-image)
       (defun gnus-mode-line-buffer-identification (line)
-       (let ((str (car-safe line)))
+       (let ((str (car-safe line))
+             (load-path (mm-image-load-path)))
          (if (and (stringp str)
                   (string-match "^Gnus:" str))
              (progn (add-text-properties
@@ -876,7 +877,7 @@ be set in `.emacs' instead."
         (display-graphic-p)
         (let* ((bg (face-background 'default))
                (fg (face-foreground 'gnus-splash-face))
-               (data-directory (nnheader-find-etc-directory "gnus"))
+               (data-directory (nnheader-find-etc-directory "images/gnus"))
                (image (find-image
                        `((:type xpm :file "gnus.xpm"
                                 :color-symbols
@@ -2895,7 +2896,7 @@ gnus-registry.el will populate this if it's loaded.")
      ("international/mw32misc" define-process-argument-editing
       general-process-argument-editing-function)
      ("gnus-agent" gnus-open-agent gnus-agent-get-function
-      gnus-agent-save-groups gnus-agent-save-active gnus-agent-method-p
+      gnus-agent-save-active gnus-agent-method-p
       gnus-agent-get-undownloaded-list gnus-agent-fetch-session
       gnus-summary-set-agent-mark gnus-agent-save-group-info
       gnus-agent-request-article gnus-agent-retrieve-headers)