79 files changed, 14 insertions, 5 deletions
diff --git a/lisp/gnus/bar.xbm b/etc/images/gnus/bar.xbm
index e61300adb2..e61300adb2 100644
--- a/lisp/gnus/bar.xbm
+++ b/etc/images/gnus/bar.xbm
diff --git a/lisp/gnus/bar.xpm b/etc/images/gnus/bar.xpm
index 2985065a5c..2985065a5c 100644
--- a/lisp/gnus/bar.xpm
+++ b/etc/images/gnus/bar.xpm
diff --git a/lisp/gnus/catchup.pbm b/etc/images/gnus/catchup.pbm
index 3fc571bdf8..3fc571bdf8 100644
--- a/lisp/gnus/catchup.pbm
+++ b/etc/images/gnus/catchup.pbm
diff --git a/lisp/gnus/catchup.xpm b/etc/images/gnus/catchup.xpm
index cba849712d..cba849712d 100644
--- a/lisp/gnus/catchup.xpm
+++ b/etc/images/gnus/catchup.xpm
diff --git a/lisp/gnus/cu-exit.pbm b/etc/images/gnus/cu-exit.pbm
index 210869cce7..210869cce7 100644
--- a/lisp/gnus/cu-exit.pbm
+++ b/etc/images/gnus/cu-exit.pbm
diff --git a/lisp/gnus/cu-exit.xpm b/etc/images/gnus/cu-exit.xpm
index 17236223fe..17236223fe 100644
--- a/lisp/gnus/cu-exit.xpm
+++ b/etc/images/gnus/cu-exit.xpm
diff --git a/lisp/gnus/dead.xpm b/etc/images/gnus/dead.xpm
index 56463a7295..56463a7295 100644
--- a/lisp/gnus/dead.xpm
+++ b/etc/images/gnus/dead.xpm
diff --git a/lisp/gnus/describe-group.pbm b/etc/images/gnus/describe-group.pbm
index de7bf11043..de7bf11043 100644
--- a/lisp/gnus/describe-group.pbm
+++ b/etc/images/gnus/describe-group.pbm
diff --git a/lisp/gnus/describe-group.xpm b/etc/images/gnus/describe-group.xpm
index b4a6f42a94..b4a6f42a94 100644
--- a/lisp/gnus/describe-group.xpm
+++ b/etc/images/gnus/describe-group.xpm
diff --git a/lisp/gnus/exit-gnus.pbm b/etc/images/gnus/exit-gnus.pbm
index 32ad0e0ebe..32ad0e0ebe 100644
--- a/lisp/gnus/exit-gnus.pbm
+++ b/etc/images/gnus/exit-gnus.pbm
diff --git a/lisp/gnus/exit-gnus.xpm b/etc/images/gnus/exit-gnus.xpm
index 534f3c2faf..534f3c2faf 100644
--- a/lisp/gnus/exit-gnus.xpm
+++ b/etc/images/gnus/exit-gnus.xpm
diff --git a/lisp/gnus/exit-summ.pbm b/etc/images/gnus/exit-summ.pbm
index d019231060..d019231060 100644
--- a/lisp/gnus/exit-summ.pbm
+++ b/etc/images/gnus/exit-summ.pbm
diff --git a/lisp/gnus/exit-summ.xpm b/etc/images/gnus/exit-summ.xpm
index 5234ccb11e..5234ccb11e 100644
--- a/lisp/gnus/exit-summ.xpm
+++ b/etc/images/gnus/exit-summ.xpm
diff --git a/lisp/gnus/followup.pbm b/etc/images/gnus/followup.pbm
index 61be114096..61be114096 100644
--- a/lisp/gnus/followup.pbm
+++ b/etc/images/gnus/followup.pbm
diff --git a/lisp/gnus/followup.xpm b/etc/images/gnus/followup.xpm
index 444895a439..444895a439 100644
--- a/lisp/gnus/followup.xpm
+++ b/etc/images/gnus/followup.xpm
diff --git a/lisp/gnus/fuwo.pbm b/etc/images/gnus/fuwo.pbm
index b81af10c39..b81af10c39 100644
--- a/lisp/gnus/fuwo.pbm
+++ b/etc/images/gnus/fuwo.pbm
diff --git a/lisp/gnus/fuwo.xpm b/etc/images/gnus/fuwo.xpm
index 362cbc5725..362cbc5725 100644
--- a/lisp/gnus/fuwo.xpm
+++ b/etc/images/gnus/fuwo.xpm
diff --git a/lisp/gnus/get-news.pbm b/etc/images/gnus/get-news.pbm
index c0080716c4..c0080716c4 100644
--- a/lisp/gnus/get-news.pbm
+++ b/etc/images/gnus/get-news.pbm
diff --git a/lisp/gnus/get-news.xpm b/etc/images/gnus/get-news.xpm
index d7e7b4a355..d7e7b4a355 100644
--- a/lisp/gnus/get-news.xpm
+++ b/etc/images/gnus/get-news.xpm
diff --git a/lisp/gnus/gnntg.pbm b/etc/images/gnus/gnntg.pbm
index 2f5e5261a9..2f5e5261a9 100644
--- a/lisp/gnus/gnntg.pbm
+++ b/etc/images/gnus/gnntg.pbm
diff --git a/lisp/gnus/gnntg.xpm b/etc/images/gnus/gnntg.xpm
index 21bc5f16eb..21bc5f16eb 100644
--- a/lisp/gnus/gnntg.xpm
+++ b/etc/images/gnus/gnntg.xpm
diff --git a/lisp/gnus/gnus-pointer.xbm b/etc/images/gnus/gnus-pointer.xbm
index 94e915428c..94e915428c 100644
--- a/lisp/gnus/gnus-pointer.xbm
+++ b/etc/images/gnus/gnus-pointer.xbm
diff --git a/lisp/gnus/gnus-pointer.xpm b/etc/images/gnus/gnus-pointer.xpm
index c47443dbb7..c47443dbb7 100644
--- a/lisp/gnus/gnus-pointer.xpm
+++ b/etc/images/gnus/gnus-pointer.xpm
diff --git a/lisp/gnus/gnus.xbm b/etc/images/gnus/gnus.xbm
index 58d1ac845a..58d1ac845a 100644
--- a/lisp/gnus/gnus.xbm
+++ b/etc/images/gnus/gnus.xbm
diff --git a/lisp/gnus/gnus.xpm b/etc/images/gnus/gnus.xpm
index b6ee4d0d73..b6ee4d0d73 100644
--- a/lisp/gnus/gnus.xpm
+++ b/etc/images/gnus/gnus.xpm
diff --git a/lisp/gnus/important.xpm b/etc/images/gnus/important.xpm
index e972facff2..e972facff2 100644
--- a/lisp/gnus/important.xpm
+++ b/etc/images/gnus/important.xpm
diff --git a/lisp/gnus/kill-group.pbm b/etc/images/gnus/kill-group.pbm
index 50831447f5..50831447f5 100644
--- a/lisp/gnus/kill-group.pbm
+++ b/etc/images/gnus/kill-group.pbm
diff --git a/lisp/gnus/kill-group.xpm b/etc/images/gnus/kill-group.xpm
index 1ee4fa42ad..1ee4fa42ad 100644
--- a/lisp/gnus/kill-group.xpm
+++ b/etc/images/gnus/kill-group.xpm
diff --git a/lisp/gnus/mail-reply.pbm b/etc/images/gnus/mail-reply.pbm
index 9ca76596fb..9ca76596fb 100644
--- a/lisp/gnus/mail-reply.pbm
+++ b/etc/images/gnus/mail-reply.pbm
diff --git a/lisp/gnus/mail-reply.xpm b/etc/images/gnus/mail-reply.xpm
index a87f784617..a87f784617 100644
--- a/lisp/gnus/mail-reply.xpm
+++ b/etc/images/gnus/mail-reply.xpm
diff --git a/lisp/gnus/next-ur.pbm b/etc/images/gnus/next-ur.pbm
index 678bbb09f8..678bbb09f8 100644
--- a/lisp/gnus/next-ur.pbm
+++ b/etc/images/gnus/next-ur.pbm
diff --git a/lisp/gnus/next-ur.xpm b/etc/images/gnus/next-ur.xpm
index bea13280b6..bea13280b6 100644
--- a/lisp/gnus/next-ur.xpm
+++ b/etc/images/gnus/next-ur.xpm
diff --git a/lisp/gnus/post.pbm b/etc/images/gnus/post.pbm
index 577d6236bf..577d6236bf 100644
--- a/lisp/gnus/post.pbm
+++ b/etc/images/gnus/post.pbm
diff --git a/lisp/gnus/post.xpm b/etc/images/gnus/post.xpm
index 7a3eaa5e3b..7a3eaa5e3b 100644
--- a/lisp/gnus/post.xpm
+++ b/etc/images/gnus/post.xpm
diff --git a/lisp/gnus/prev-ur.pbm b/etc/images/gnus/prev-ur.pbm
index 49389198bd..49389198bd 100644
--- a/lisp/gnus/prev-ur.pbm
+++ b/etc/images/gnus/prev-ur.pbm
diff --git a/lisp/gnus/prev-ur.xpm b/etc/images/gnus/prev-ur.xpm
index 8013133283..8013133283 100644
--- a/lisp/gnus/prev-ur.xpm
+++ b/etc/images/gnus/prev-ur.xpm
diff --git a/lisp/gnus/preview.xbm b/etc/images/gnus/preview.xbm
index a42e153d5d..a42e153d5d 100644
--- a/lisp/gnus/preview.xbm
+++ b/etc/images/gnus/preview.xbm
diff --git a/lisp/gnus/preview.xpm b/etc/images/gnus/preview.xpm
index f5743f9152..f5743f9152 100644
--- a/lisp/gnus/preview.xpm
+++ b/etc/images/gnus/preview.xpm
diff --git a/lisp/gnus/receipt.xpm b/etc/images/gnus/receipt.xpm
index 18caaf1cf7..18caaf1cf7 100644
--- a/lisp/gnus/receipt.xpm
+++ b/etc/images/gnus/receipt.xpm
diff --git a/lisp/gnus/reply-wo.pbm b/etc/images/gnus/reply-wo.pbm
index def54da8ed..def54da8ed 100644
--- a/lisp/gnus/reply-wo.pbm
+++ b/etc/images/gnus/reply-wo.pbm
diff --git a/lisp/gnus/reply-wo.xpm b/etc/images/gnus/reply-wo.xpm
index 370678af70..370678af70 100644
--- a/lisp/gnus/reply-wo.xpm
+++ b/etc/images/gnus/reply-wo.xpm
diff --git a/lisp/gnus/reply.pbm b/etc/images/gnus/reply.pbm
index ee181e663b..ee181e663b 100644
--- a/lisp/gnus/reply.pbm
+++ b/etc/images/gnus/reply.pbm
diff --git a/lisp/gnus/reply.xpm b/etc/images/gnus/reply.xpm
index a45884803f..a45884803f 100644
--- a/lisp/gnus/reply.xpm
+++ b/etc/images/gnus/reply.xpm
diff --git a/lisp/gnus/reverse-smile.xpm b/etc/images/gnus/reverse-smile.xpm
index 56db090e4b..56db090e4b 100644
--- a/lisp/gnus/reverse-smile.xpm
+++ b/etc/images/gnus/reverse-smile.xpm
diff --git a/lisp/gnus/rot13.pbm b/etc/images/gnus/rot13.pbm
index 104246cdb8..104246cdb8 100644
--- a/lisp/gnus/rot13.pbm
+++ b/etc/images/gnus/rot13.pbm
diff --git a/lisp/gnus/rot13.xpm b/etc/images/gnus/rot13.xpm
index 6e2d7ac3cc..6e2d7ac3cc 100644
--- a/lisp/gnus/rot13.xpm
+++ b/etc/images/gnus/rot13.xpm
diff --git a/lisp/gnus/save-aif.pbm b/etc/images/gnus/save-aif.pbm
index 15829c289e..15829c289e 100644
--- a/lisp/gnus/save-aif.pbm
+++ b/etc/images/gnus/save-aif.pbm
diff --git a/lisp/gnus/save-aif.xpm b/etc/images/gnus/save-aif.xpm
index f0325ac2fb..f0325ac2fb 100644
--- a/lisp/gnus/save-aif.xpm
+++ b/etc/images/gnus/save-aif.xpm
diff --git a/lisp/gnus/save-art.pbm b/etc/images/gnus/save-art.pbm
index 68fe0cb309..68fe0cb309 100644
--- a/lisp/gnus/save-art.pbm
+++ b/etc/images/gnus/save-art.pbm
diff --git a/lisp/gnus/save-art.xpm b/etc/images/gnus/save-art.xpm
index fe9726fa3f..fe9726fa3f 100644
--- a/lisp/gnus/save-art.xpm
+++ b/etc/images/gnus/save-art.xpm
diff --git a/lisp/gnus/subscribe.pbm b/etc/images/gnus/subscribe.pbm
index fe6b3920d3..fe6b3920d3 100644
--- a/lisp/gnus/subscribe.pbm
+++ b/etc/images/gnus/subscribe.pbm
diff --git a/lisp/gnus/subscribe.xpm b/etc/images/gnus/subscribe.xpm
index ff193a9e8a..ff193a9e8a 100644
--- a/lisp/gnus/subscribe.xpm
+++ b/etc/images/gnus/subscribe.xpm
diff --git a/lisp/gnus/unimportant.xpm b/etc/images/gnus/unimportant.xpm
index 4298224e56..4298224e56 100644
--- a/lisp/gnus/unimportant.xpm
+++ b/etc/images/gnus/unimportant.xpm
diff --git a/lisp/gnus/unsubscribe.pbm b/etc/images/gnus/unsubscribe.pbm
index 7d869fb53f..7d869fb53f 100644
--- a/lisp/gnus/unsubscribe.pbm
+++ b/etc/images/gnus/unsubscribe.pbm
diff --git a/lisp/gnus/unsubscribe.xpm b/etc/images/gnus/unsubscribe.xpm
index a91180d00f..a91180d00f 100644
--- a/lisp/gnus/unsubscribe.xpm
+++ b/etc/images/gnus/unsubscribe.xpm
diff --git a/lisp/gnus/uu-decode.pbm b/etc/images/gnus/uu-decode.pbm
index 2b7fada147..2b7fada147 100644
--- a/lisp/gnus/uu-decode.pbm
+++ b/etc/images/gnus/uu-decode.pbm
diff --git a/lisp/gnus/uu-decode.xpm b/etc/images/gnus/uu-decode.xpm
index b9d940cc99..b9d940cc99 100644
--- a/lisp/gnus/uu-decode.xpm
+++ b/etc/images/gnus/uu-decode.xpm
diff --git a/lisp/gnus/uu-post.pbm b/etc/images/gnus/uu-post.pbm
index a5face7098..a5face7098 100644
--- a/lisp/gnus/uu-post.pbm
+++ b/etc/images/gnus/uu-post.pbm
diff --git a/lisp/gnus/uu-post.xpm b/etc/images/gnus/uu-post.xpm
index 7c4204c695..7c4204c695 100644
--- a/lisp/gnus/uu-post.xpm
+++ b/etc/images/gnus/uu-post.xpm
diff --git a/lisp/gnus/blink.pbm b/etc/images/smilies/blink.pbm
index 6c7531b92c..6c7531b92c 100644
--- a/lisp/gnus/blink.pbm
+++ b/etc/images/smilies/blink.pbm
diff --git a/lisp/gnus/blink.xpm b/etc/images/smilies/blink.xpm
index 5035122119..5035122119 100644
--- a/lisp/gnus/blink.xpm
+++ b/etc/images/smilies/blink.xpm
diff --git a/lisp/gnus/braindamaged.xpm b/etc/images/smilies/braindamaged.xpm
index 25bd3e7bbe..25bd3e7bbe 100644
--- a/lisp/gnus/braindamaged.xpm
+++ b/etc/images/smilies/braindamaged.xpm
diff --git a/lisp/gnus/cry.xpm b/etc/images/smilies/cry.xpm
index 8d8558dbc5..8d8558dbc5 100644
--- a/lisp/gnus/cry.xpm
+++ b/etc/images/smilies/cry.xpm
diff --git a/lisp/gnus/evil.xpm b/etc/images/smilies/evil.xpm
index c364ac34ae..c364ac34ae 100644
--- a/lisp/gnus/evil.xpm
+++ b/etc/images/smilies/evil.xpm
diff --git a/lisp/gnus/forced.xpm b/etc/images/smilies/forced.xpm
index 43ba8d2b50..43ba8d2b50 100644
--- a/lisp/gnus/forced.xpm
+++ b/etc/images/smilies/forced.xpm
diff --git a/lisp/gnus/frown.pbm b/etc/images/smilies/frown.pbm
index f51ea4f309..f51ea4f309 100644
--- a/lisp/gnus/frown.pbm
+++ b/etc/images/smilies/frown.pbm
diff --git a/lisp/gnus/frown.xpm b/etc/images/smilies/frown.xpm
index 25ca99d11a..25ca99d11a 100644
--- a/lisp/gnus/frown.xpm
+++ b/etc/images/smilies/frown.xpm
diff --git a/lisp/gnus/grin.xpm b/etc/images/smilies/grin.xpm
index 292cb1110e..292cb1110e 100644
--- a/lisp/gnus/grin.xpm
+++ b/etc/images/smilies/grin.xpm
diff --git a/lisp/gnus/indifferent.xpm b/etc/images/smilies/indifferent.xpm
index 639523855a..639523855a 100644
--- a/lisp/gnus/indifferent.xpm
+++ b/etc/images/smilies/indifferent.xpm
diff --git a/lisp/gnus/sad.pbm b/etc/images/smilies/sad.pbm
index 892e34352d..892e34352d 100644
--- a/lisp/gnus/sad.pbm
+++ b/etc/images/smilies/sad.pbm
diff --git a/lisp/gnus/sad.xpm b/etc/images/smilies/sad.xpm
index b0acef42a5..b0acef42a5 100644
--- a/lisp/gnus/sad.xpm
+++ b/etc/images/smilies/sad.xpm
diff --git a/lisp/gnus/smile.pbm b/etc/images/smilies/smile.pbm
index f64e883498..f64e883498 100644
--- a/lisp/gnus/smile.pbm
+++ b/etc/images/smilies/smile.pbm
diff --git a/lisp/gnus/smile.xpm b/etc/images/smilies/smile.xpm
index 374d240a95..374d240a95 100644
--- a/lisp/gnus/smile.xpm
+++ b/etc/images/smilies/smile.xpm
diff --git a/lisp/gnus/wry.pbm b/etc/images/smilies/wry.pbm
index 5fa5e9f228..5fa5e9f228 100644
--- a/lisp/gnus/wry.pbm
+++ b/etc/images/smilies/wry.pbm
diff --git a/lisp/gnus/wry.xpm b/etc/images/smilies/wry.xpm
index 8cd8dedce6..8cd8dedce6 100644
--- a/lisp/gnus/wry.xpm
+++ b/etc/images/smilies/wry.xpm
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 8923ae1116..bc8b89a251 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2005-02-13  Reiner Steib  <[email protected]>
+
+	* gnus.el (gnus-group-startup-message): Search for gnus images in
+	etc/images/gnus.
+	* mm-util.el (mm-find-charset-region): Likewise.
+	* smiley.el (smiley-data-directory): Search for smilies in
+	etc/images/smilies.
+
 2005-02-09  Kim F. Storm  <[email protected]>
 
 	Change Emacs release version from 21.4 to 22.1 throughout.
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 674c8d2c0a..f5dcd296d2 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -326,7 +326,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
@@ -875,7 +876,7 @@ be set in `.emacs' instead."
    ((and
      (fboundp 'find-image)
      (display-graphic-p)
-     (let* ((data-directory (nnheader-find-etc-directory "gnus"))
+     (let* ((data-directory (nnheader-find-etc-directory "images/gnus"))
 	    (image (find-image
 		    `((:type xpm :file "gnus.xpm"
 			     :color-symbols
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index c0ccaa316b..5b4200d6d5 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -1,5 +1,5 @@
 ;;; mm-util.el --- Utility functions for Mule and low level things
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <[email protected]>
@@ -901,7 +901,7 @@ If INHIBIT is non-nil, inhibit `mm-inhibit-file-name-handlers'."
 		 (file-directory-p
 		  (setq dir (concat (file-name-directory
 				     (directory-file-name path))
-				    "etc/" (or package "gnus/")))))
+				    "etc/images/" (or package "gnus/")))))
 	(push dir result))
       (push path result))))
 
diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index 74a4d9cf59..27a54829aa 100644
--- a/lisp/gnus/smiley.el
+++ b/lisp/gnus/smiley.el
@@ -44,7 +44,7 @@
   :group 'gnus-visual)
 
 ;; Maybe this should go.
-(defcustom smiley-data-directory (nnheader-find-etc-directory "smilies")
+(defcustom smiley-data-directory (nnheader-find-etc-directory "images/smilies")
   "*Location of the smiley faces files."
   :type 'directory
   :group 'smiley)