From d31fa104a1009de730e74befec2b4512b729a0c9 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Sun, 13 Feb 2005 08:47:45 +0000 Subject: [PATCH] Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-96 Move Gnus images into etc/images 2005-02-13 Reiner Steib * lisp/gnus/gnus.el (gnus-group-startup-message): Search for gnus images in etc/images/gnus. * lisp/gnus/mm-util.el (mm-find-charset-region): Likewise. * lisp/gnus/smiley.el (smiley-data-directory): Search for smilies in etc/images/smilies. --- {lisp => etc/images}/gnus/bar.xbm | 0 {lisp => etc/images}/gnus/bar.xpm | 0 {lisp => etc/images}/gnus/catchup.pbm | Bin {lisp => etc/images}/gnus/catchup.xpm | 0 {lisp => etc/images}/gnus/cu-exit.pbm | Bin {lisp => etc/images}/gnus/cu-exit.xpm | 0 {lisp => etc/images}/gnus/dead.xpm | 0 {lisp => etc/images}/gnus/describe-group.pbm | Bin {lisp => etc/images}/gnus/describe-group.xpm | 0 {lisp => etc/images}/gnus/exit-gnus.pbm | Bin {lisp => etc/images}/gnus/exit-gnus.xpm | 0 {lisp => etc/images}/gnus/exit-summ.pbm | Bin {lisp => etc/images}/gnus/exit-summ.xpm | 0 {lisp => etc/images}/gnus/followup.pbm | Bin {lisp => etc/images}/gnus/followup.xpm | 0 {lisp => etc/images}/gnus/fuwo.pbm | Bin {lisp => etc/images}/gnus/fuwo.xpm | 0 {lisp => etc/images}/gnus/get-news.pbm | Bin {lisp => etc/images}/gnus/get-news.xpm | 0 {lisp => etc/images}/gnus/gnntg.pbm | Bin {lisp => etc/images}/gnus/gnntg.xpm | 0 {lisp => etc/images}/gnus/gnus-pointer.xbm | 0 {lisp => etc/images}/gnus/gnus-pointer.xpm | 0 {lisp => etc/images}/gnus/gnus.xbm | 0 {lisp => etc/images}/gnus/gnus.xpm | 0 {lisp => etc/images}/gnus/important.xpm | 0 {lisp => etc/images}/gnus/kill-group.pbm | Bin {lisp => etc/images}/gnus/kill-group.xpm | 0 {lisp => etc/images}/gnus/mail-reply.pbm | Bin {lisp => etc/images}/gnus/mail-reply.xpm | 0 {lisp => etc/images}/gnus/next-ur.pbm | Bin {lisp => etc/images}/gnus/next-ur.xpm | 0 {lisp => etc/images}/gnus/post.pbm | Bin {lisp => etc/images}/gnus/post.xpm | 0 {lisp => etc/images}/gnus/prev-ur.pbm | Bin {lisp => etc/images}/gnus/prev-ur.xpm | 0 {lisp => etc/images}/gnus/preview.xbm | 0 {lisp => etc/images}/gnus/preview.xpm | 0 {lisp => etc/images}/gnus/receipt.xpm | 0 {lisp => etc/images}/gnus/reply-wo.pbm | Bin {lisp => etc/images}/gnus/reply-wo.xpm | 0 {lisp => etc/images}/gnus/reply.pbm | Bin {lisp => etc/images}/gnus/reply.xpm | 0 {lisp => etc/images}/gnus/reverse-smile.xpm | 0 {lisp => etc/images}/gnus/rot13.pbm | Bin {lisp => etc/images}/gnus/rot13.xpm | 0 {lisp => etc/images}/gnus/save-aif.pbm | Bin {lisp => etc/images}/gnus/save-aif.xpm | 0 {lisp => etc/images}/gnus/save-art.pbm | Bin {lisp => etc/images}/gnus/save-art.xpm | 0 {lisp => etc/images}/gnus/subscribe.pbm | Bin {lisp => etc/images}/gnus/subscribe.xpm | 0 {lisp => etc/images}/gnus/unimportant.xpm | 0 {lisp => etc/images}/gnus/unsubscribe.pbm | Bin {lisp => etc/images}/gnus/unsubscribe.xpm | 0 {lisp => etc/images}/gnus/uu-decode.pbm | Bin {lisp => etc/images}/gnus/uu-decode.xpm | 0 {lisp => etc/images}/gnus/uu-post.pbm | Bin {lisp => etc/images}/gnus/uu-post.xpm | 0 {lisp/gnus => etc/images/smilies}/blink.pbm | Bin {lisp/gnus => etc/images/smilies}/blink.xpm | 0 {lisp/gnus => etc/images/smilies}/braindamaged.xpm | 0 {lisp/gnus => etc/images/smilies}/cry.xpm | 0 {lisp/gnus => etc/images/smilies}/evil.xpm | 0 {lisp/gnus => etc/images/smilies}/forced.xpm | 0 {lisp/gnus => etc/images/smilies}/frown.pbm | Bin {lisp/gnus => etc/images/smilies}/frown.xpm | 0 {lisp/gnus => etc/images/smilies}/grin.xpm | 0 {lisp/gnus => etc/images/smilies}/indifferent.xpm | 0 {lisp/gnus => etc/images/smilies}/sad.pbm | Bin {lisp/gnus => etc/images/smilies}/sad.xpm | 0 {lisp/gnus => etc/images/smilies}/smile.pbm | Bin {lisp/gnus => etc/images/smilies}/smile.xpm | 0 {lisp/gnus => etc/images/smilies}/wry.pbm | Bin {lisp/gnus => etc/images/smilies}/wry.xpm | 0 lisp/gnus/ChangeLog | 8 ++++++++ lisp/gnus/gnus.el | 5 +++-- lisp/gnus/mm-util.el | 4 ++-- lisp/gnus/smiley.el | 2 +- 79 files changed, 14 insertions(+), 5 deletions(-) rename {lisp => etc/images}/gnus/bar.xbm (100%) rename {lisp => etc/images}/gnus/bar.xpm (100%) rename {lisp => etc/images}/gnus/catchup.pbm (100%) rename {lisp => etc/images}/gnus/catchup.xpm (100%) rename {lisp => etc/images}/gnus/cu-exit.pbm (100%) rename {lisp => etc/images}/gnus/cu-exit.xpm (100%) rename {lisp => etc/images}/gnus/dead.xpm (100%) rename {lisp => etc/images}/gnus/describe-group.pbm (100%) rename {lisp => etc/images}/gnus/describe-group.xpm (100%) rename {lisp => etc/images}/gnus/exit-gnus.pbm (100%) rename {lisp => etc/images}/gnus/exit-gnus.xpm (100%) rename {lisp => etc/images}/gnus/exit-summ.pbm (100%) rename {lisp => etc/images}/gnus/exit-summ.xpm (100%) rename {lisp => etc/images}/gnus/followup.pbm (100%) rename {lisp => etc/images}/gnus/followup.xpm (100%) rename {lisp => etc/images}/gnus/fuwo.pbm (100%) rename {lisp => etc/images}/gnus/fuwo.xpm (100%) rename {lisp => etc/images}/gnus/get-news.pbm (100%) rename {lisp => etc/images}/gnus/get-news.xpm (100%) rename {lisp => etc/images}/gnus/gnntg.pbm (100%) rename {lisp => etc/images}/gnus/gnntg.xpm (100%) rename {lisp => etc/images}/gnus/gnus-pointer.xbm (100%) rename {lisp => etc/images}/gnus/gnus-pointer.xpm (100%) rename {lisp => etc/images}/gnus/gnus.xbm (100%) rename {lisp => etc/images}/gnus/gnus.xpm (100%) rename {lisp => etc/images}/gnus/important.xpm (100%) rename {lisp => etc/images}/gnus/kill-group.pbm (100%) rename {lisp => etc/images}/gnus/kill-group.xpm (100%) rename {lisp => etc/images}/gnus/mail-reply.pbm (100%) rename {lisp => etc/images}/gnus/mail-reply.xpm (100%) rename {lisp => etc/images}/gnus/next-ur.pbm (100%) rename {lisp => etc/images}/gnus/next-ur.xpm (100%) rename {lisp => etc/images}/gnus/post.pbm (100%) rename {lisp => etc/images}/gnus/post.xpm (100%) rename {lisp => etc/images}/gnus/prev-ur.pbm (100%) rename {lisp => etc/images}/gnus/prev-ur.xpm (100%) rename {lisp => etc/images}/gnus/preview.xbm (100%) rename {lisp => etc/images}/gnus/preview.xpm (100%) rename {lisp => etc/images}/gnus/receipt.xpm (100%) rename {lisp => etc/images}/gnus/reply-wo.pbm (100%) rename {lisp => etc/images}/gnus/reply-wo.xpm (100%) rename {lisp => etc/images}/gnus/reply.pbm (100%) rename {lisp => etc/images}/gnus/reply.xpm (100%) rename {lisp => etc/images}/gnus/reverse-smile.xpm (100%) rename {lisp => etc/images}/gnus/rot13.pbm (100%) rename {lisp => etc/images}/gnus/rot13.xpm (100%) rename {lisp => etc/images}/gnus/save-aif.pbm (100%) rename {lisp => etc/images}/gnus/save-aif.xpm (100%) rename {lisp => etc/images}/gnus/save-art.pbm (100%) rename {lisp => etc/images}/gnus/save-art.xpm (100%) rename {lisp => etc/images}/gnus/subscribe.pbm (100%) rename {lisp => etc/images}/gnus/subscribe.xpm (100%) rename {lisp => etc/images}/gnus/unimportant.xpm (100%) rename {lisp => etc/images}/gnus/unsubscribe.pbm (100%) rename {lisp => etc/images}/gnus/unsubscribe.xpm (100%) rename {lisp => etc/images}/gnus/uu-decode.pbm (100%) rename {lisp => etc/images}/gnus/uu-decode.xpm (100%) rename {lisp => etc/images}/gnus/uu-post.pbm (100%) rename {lisp => etc/images}/gnus/uu-post.xpm (100%) rename {lisp/gnus => etc/images/smilies}/blink.pbm (100%) rename {lisp/gnus => etc/images/smilies}/blink.xpm (100%) rename {lisp/gnus => etc/images/smilies}/braindamaged.xpm (100%) rename {lisp/gnus => etc/images/smilies}/cry.xpm (100%) rename {lisp/gnus => etc/images/smilies}/evil.xpm (100%) rename {lisp/gnus => etc/images/smilies}/forced.xpm (100%) rename {lisp/gnus => etc/images/smilies}/frown.pbm (100%) rename {lisp/gnus => etc/images/smilies}/frown.xpm (100%) rename {lisp/gnus => etc/images/smilies}/grin.xpm (100%) rename {lisp/gnus => etc/images/smilies}/indifferent.xpm (100%) rename {lisp/gnus => etc/images/smilies}/sad.pbm (100%) rename {lisp/gnus => etc/images/smilies}/sad.xpm (100%) rename {lisp/gnus => etc/images/smilies}/smile.pbm (100%) rename {lisp/gnus => etc/images/smilies}/smile.xpm (100%) rename {lisp/gnus => etc/images/smilies}/wry.pbm (100%) rename {lisp/gnus => etc/images/smilies}/wry.xpm (100%) diff --git a/lisp/gnus/bar.xbm b/etc/images/gnus/bar.xbm similarity index 100% rename from lisp/gnus/bar.xbm rename to etc/images/gnus/bar.xbm diff --git a/lisp/gnus/bar.xpm b/etc/images/gnus/bar.xpm similarity index 100% rename from lisp/gnus/bar.xpm rename to etc/images/gnus/bar.xpm diff --git a/lisp/gnus/catchup.pbm b/etc/images/gnus/catchup.pbm similarity index 100% rename from lisp/gnus/catchup.pbm rename to etc/images/gnus/catchup.pbm diff --git a/lisp/gnus/catchup.xpm b/etc/images/gnus/catchup.xpm similarity index 100% rename from lisp/gnus/catchup.xpm rename to etc/images/gnus/catchup.xpm diff --git a/lisp/gnus/cu-exit.pbm b/etc/images/gnus/cu-exit.pbm similarity index 100% rename from lisp/gnus/cu-exit.pbm rename to etc/images/gnus/cu-exit.pbm diff --git a/lisp/gnus/cu-exit.xpm b/etc/images/gnus/cu-exit.xpm similarity index 100% rename from lisp/gnus/cu-exit.xpm rename to etc/images/gnus/cu-exit.xpm diff --git a/lisp/gnus/dead.xpm b/etc/images/gnus/dead.xpm similarity index 100% rename from lisp/gnus/dead.xpm rename to etc/images/gnus/dead.xpm diff --git a/lisp/gnus/describe-group.pbm b/etc/images/gnus/describe-group.pbm similarity index 100% rename from lisp/gnus/describe-group.pbm rename to etc/images/gnus/describe-group.pbm diff --git a/lisp/gnus/describe-group.xpm b/etc/images/gnus/describe-group.xpm similarity index 100% rename from lisp/gnus/describe-group.xpm rename to etc/images/gnus/describe-group.xpm diff --git a/lisp/gnus/exit-gnus.pbm b/etc/images/gnus/exit-gnus.pbm similarity index 100% rename from lisp/gnus/exit-gnus.pbm rename to etc/images/gnus/exit-gnus.pbm diff --git a/lisp/gnus/exit-gnus.xpm b/etc/images/gnus/exit-gnus.xpm similarity index 100% rename from lisp/gnus/exit-gnus.xpm rename to etc/images/gnus/exit-gnus.xpm diff --git a/lisp/gnus/exit-summ.pbm b/etc/images/gnus/exit-summ.pbm similarity index 100% rename from lisp/gnus/exit-summ.pbm rename to etc/images/gnus/exit-summ.pbm diff --git a/lisp/gnus/exit-summ.xpm b/etc/images/gnus/exit-summ.xpm similarity index 100% rename from lisp/gnus/exit-summ.xpm rename to etc/images/gnus/exit-summ.xpm diff --git a/lisp/gnus/followup.pbm b/etc/images/gnus/followup.pbm similarity index 100% rename from lisp/gnus/followup.pbm rename to etc/images/gnus/followup.pbm diff --git a/lisp/gnus/followup.xpm b/etc/images/gnus/followup.xpm similarity index 100% rename from lisp/gnus/followup.xpm rename to etc/images/gnus/followup.xpm diff --git a/lisp/gnus/fuwo.pbm b/etc/images/gnus/fuwo.pbm similarity index 100% rename from lisp/gnus/fuwo.pbm rename to etc/images/gnus/fuwo.pbm diff --git a/lisp/gnus/fuwo.xpm b/etc/images/gnus/fuwo.xpm similarity index 100% rename from lisp/gnus/fuwo.xpm rename to etc/images/gnus/fuwo.xpm diff --git a/lisp/gnus/get-news.pbm b/etc/images/gnus/get-news.pbm similarity index 100% rename from lisp/gnus/get-news.pbm rename to etc/images/gnus/get-news.pbm diff --git a/lisp/gnus/get-news.xpm b/etc/images/gnus/get-news.xpm similarity index 100% rename from lisp/gnus/get-news.xpm rename to etc/images/gnus/get-news.xpm diff --git a/lisp/gnus/gnntg.pbm b/etc/images/gnus/gnntg.pbm similarity index 100% rename from lisp/gnus/gnntg.pbm rename to etc/images/gnus/gnntg.pbm diff --git a/lisp/gnus/gnntg.xpm b/etc/images/gnus/gnntg.xpm similarity index 100% rename from lisp/gnus/gnntg.xpm rename to etc/images/gnus/gnntg.xpm diff --git a/lisp/gnus/gnus-pointer.xbm b/etc/images/gnus/gnus-pointer.xbm similarity index 100% rename from lisp/gnus/gnus-pointer.xbm rename to etc/images/gnus/gnus-pointer.xbm diff --git a/lisp/gnus/gnus-pointer.xpm b/etc/images/gnus/gnus-pointer.xpm similarity index 100% rename from lisp/gnus/gnus-pointer.xpm rename to etc/images/gnus/gnus-pointer.xpm diff --git a/lisp/gnus/gnus.xbm b/etc/images/gnus/gnus.xbm similarity index 100% rename from lisp/gnus/gnus.xbm rename to etc/images/gnus/gnus.xbm diff --git a/lisp/gnus/gnus.xpm b/etc/images/gnus/gnus.xpm similarity index 100% rename from lisp/gnus/gnus.xpm rename to etc/images/gnus/gnus.xpm diff --git a/lisp/gnus/important.xpm b/etc/images/gnus/important.xpm similarity index 100% rename from lisp/gnus/important.xpm rename to etc/images/gnus/important.xpm diff --git a/lisp/gnus/kill-group.pbm b/etc/images/gnus/kill-group.pbm similarity index 100% rename from lisp/gnus/kill-group.pbm rename to etc/images/gnus/kill-group.pbm diff --git a/lisp/gnus/kill-group.xpm b/etc/images/gnus/kill-group.xpm similarity index 100% rename from lisp/gnus/kill-group.xpm rename to etc/images/gnus/kill-group.xpm diff --git a/lisp/gnus/mail-reply.pbm b/etc/images/gnus/mail-reply.pbm similarity index 100% rename from lisp/gnus/mail-reply.pbm rename to etc/images/gnus/mail-reply.pbm diff --git a/lisp/gnus/mail-reply.xpm b/etc/images/gnus/mail-reply.xpm similarity index 100% rename from lisp/gnus/mail-reply.xpm rename to etc/images/gnus/mail-reply.xpm diff --git a/lisp/gnus/next-ur.pbm b/etc/images/gnus/next-ur.pbm similarity index 100% rename from lisp/gnus/next-ur.pbm rename to etc/images/gnus/next-ur.pbm diff --git a/lisp/gnus/next-ur.xpm b/etc/images/gnus/next-ur.xpm similarity index 100% rename from lisp/gnus/next-ur.xpm rename to etc/images/gnus/next-ur.xpm diff --git a/lisp/gnus/post.pbm b/etc/images/gnus/post.pbm similarity index 100% rename from lisp/gnus/post.pbm rename to etc/images/gnus/post.pbm diff --git a/lisp/gnus/post.xpm b/etc/images/gnus/post.xpm similarity index 100% rename from lisp/gnus/post.xpm rename to etc/images/gnus/post.xpm diff --git a/lisp/gnus/prev-ur.pbm b/etc/images/gnus/prev-ur.pbm similarity index 100% rename from lisp/gnus/prev-ur.pbm rename to etc/images/gnus/prev-ur.pbm diff --git a/lisp/gnus/prev-ur.xpm b/etc/images/gnus/prev-ur.xpm similarity index 100% rename from lisp/gnus/prev-ur.xpm rename to etc/images/gnus/prev-ur.xpm diff --git a/lisp/gnus/preview.xbm b/etc/images/gnus/preview.xbm similarity index 100% rename from lisp/gnus/preview.xbm rename to etc/images/gnus/preview.xbm diff --git a/lisp/gnus/preview.xpm b/etc/images/gnus/preview.xpm similarity index 100% rename from lisp/gnus/preview.xpm rename to etc/images/gnus/preview.xpm diff --git a/lisp/gnus/receipt.xpm b/etc/images/gnus/receipt.xpm similarity index 100% rename from lisp/gnus/receipt.xpm rename to etc/images/gnus/receipt.xpm diff --git a/lisp/gnus/reply-wo.pbm b/etc/images/gnus/reply-wo.pbm similarity index 100% rename from lisp/gnus/reply-wo.pbm rename to etc/images/gnus/reply-wo.pbm diff --git a/lisp/gnus/reply-wo.xpm b/etc/images/gnus/reply-wo.xpm similarity index 100% rename from lisp/gnus/reply-wo.xpm rename to etc/images/gnus/reply-wo.xpm diff --git a/lisp/gnus/reply.pbm b/etc/images/gnus/reply.pbm similarity index 100% rename from lisp/gnus/reply.pbm rename to etc/images/gnus/reply.pbm diff --git a/lisp/gnus/reply.xpm b/etc/images/gnus/reply.xpm similarity index 100% rename from lisp/gnus/reply.xpm rename to etc/images/gnus/reply.xpm diff --git a/lisp/gnus/reverse-smile.xpm b/etc/images/gnus/reverse-smile.xpm similarity index 100% rename from lisp/gnus/reverse-smile.xpm rename to etc/images/gnus/reverse-smile.xpm diff --git a/lisp/gnus/rot13.pbm b/etc/images/gnus/rot13.pbm similarity index 100% rename from lisp/gnus/rot13.pbm rename to etc/images/gnus/rot13.pbm diff --git a/lisp/gnus/rot13.xpm b/etc/images/gnus/rot13.xpm similarity index 100% rename from lisp/gnus/rot13.xpm rename to etc/images/gnus/rot13.xpm diff --git a/lisp/gnus/save-aif.pbm b/etc/images/gnus/save-aif.pbm similarity index 100% rename from lisp/gnus/save-aif.pbm rename to etc/images/gnus/save-aif.pbm diff --git a/lisp/gnus/save-aif.xpm b/etc/images/gnus/save-aif.xpm similarity index 100% rename from lisp/gnus/save-aif.xpm rename to etc/images/gnus/save-aif.xpm diff --git a/lisp/gnus/save-art.pbm b/etc/images/gnus/save-art.pbm similarity index 100% rename from lisp/gnus/save-art.pbm rename to etc/images/gnus/save-art.pbm diff --git a/lisp/gnus/save-art.xpm b/etc/images/gnus/save-art.xpm similarity index 100% rename from lisp/gnus/save-art.xpm rename to etc/images/gnus/save-art.xpm diff --git a/lisp/gnus/subscribe.pbm b/etc/images/gnus/subscribe.pbm similarity index 100% rename from lisp/gnus/subscribe.pbm rename to etc/images/gnus/subscribe.pbm diff --git a/lisp/gnus/subscribe.xpm b/etc/images/gnus/subscribe.xpm similarity index 100% rename from lisp/gnus/subscribe.xpm rename to etc/images/gnus/subscribe.xpm diff --git a/lisp/gnus/unimportant.xpm b/etc/images/gnus/unimportant.xpm similarity index 100% rename from lisp/gnus/unimportant.xpm rename to etc/images/gnus/unimportant.xpm diff --git a/lisp/gnus/unsubscribe.pbm b/etc/images/gnus/unsubscribe.pbm similarity index 100% rename from lisp/gnus/unsubscribe.pbm rename to etc/images/gnus/unsubscribe.pbm diff --git a/lisp/gnus/unsubscribe.xpm b/etc/images/gnus/unsubscribe.xpm similarity index 100% rename from lisp/gnus/unsubscribe.xpm rename to etc/images/gnus/unsubscribe.xpm diff --git a/lisp/gnus/uu-decode.pbm b/etc/images/gnus/uu-decode.pbm similarity index 100% rename from lisp/gnus/uu-decode.pbm rename to etc/images/gnus/uu-decode.pbm diff --git a/lisp/gnus/uu-decode.xpm b/etc/images/gnus/uu-decode.xpm similarity index 100% rename from lisp/gnus/uu-decode.xpm rename to etc/images/gnus/uu-decode.xpm diff --git a/lisp/gnus/uu-post.pbm b/etc/images/gnus/uu-post.pbm similarity index 100% rename from lisp/gnus/uu-post.pbm rename to etc/images/gnus/uu-post.pbm diff --git a/lisp/gnus/uu-post.xpm b/etc/images/gnus/uu-post.xpm similarity index 100% rename from lisp/gnus/uu-post.xpm rename to etc/images/gnus/uu-post.xpm diff --git a/lisp/gnus/blink.pbm b/etc/images/smilies/blink.pbm similarity index 100% rename from lisp/gnus/blink.pbm rename to etc/images/smilies/blink.pbm diff --git a/lisp/gnus/blink.xpm b/etc/images/smilies/blink.xpm similarity index 100% rename from lisp/gnus/blink.xpm rename to etc/images/smilies/blink.xpm diff --git a/lisp/gnus/braindamaged.xpm b/etc/images/smilies/braindamaged.xpm similarity index 100% rename from lisp/gnus/braindamaged.xpm rename to etc/images/smilies/braindamaged.xpm diff --git a/lisp/gnus/cry.xpm b/etc/images/smilies/cry.xpm similarity index 100% rename from lisp/gnus/cry.xpm rename to etc/images/smilies/cry.xpm diff --git a/lisp/gnus/evil.xpm b/etc/images/smilies/evil.xpm similarity index 100% rename from lisp/gnus/evil.xpm rename to etc/images/smilies/evil.xpm diff --git a/lisp/gnus/forced.xpm b/etc/images/smilies/forced.xpm similarity index 100% rename from lisp/gnus/forced.xpm rename to etc/images/smilies/forced.xpm diff --git a/lisp/gnus/frown.pbm b/etc/images/smilies/frown.pbm similarity index 100% rename from lisp/gnus/frown.pbm rename to etc/images/smilies/frown.pbm diff --git a/lisp/gnus/frown.xpm b/etc/images/smilies/frown.xpm similarity index 100% rename from lisp/gnus/frown.xpm rename to etc/images/smilies/frown.xpm diff --git a/lisp/gnus/grin.xpm b/etc/images/smilies/grin.xpm similarity index 100% rename from lisp/gnus/grin.xpm rename to etc/images/smilies/grin.xpm diff --git a/lisp/gnus/indifferent.xpm b/etc/images/smilies/indifferent.xpm similarity index 100% rename from lisp/gnus/indifferent.xpm rename to etc/images/smilies/indifferent.xpm diff --git a/lisp/gnus/sad.pbm b/etc/images/smilies/sad.pbm similarity index 100% rename from lisp/gnus/sad.pbm rename to etc/images/smilies/sad.pbm diff --git a/lisp/gnus/sad.xpm b/etc/images/smilies/sad.xpm similarity index 100% rename from lisp/gnus/sad.xpm rename to etc/images/smilies/sad.xpm diff --git a/lisp/gnus/smile.pbm b/etc/images/smilies/smile.pbm similarity index 100% rename from lisp/gnus/smile.pbm rename to etc/images/smilies/smile.pbm diff --git a/lisp/gnus/smile.xpm b/etc/images/smilies/smile.xpm similarity index 100% rename from lisp/gnus/smile.xpm rename to etc/images/smilies/smile.xpm diff --git a/lisp/gnus/wry.pbm b/etc/images/smilies/wry.pbm similarity index 100% rename from lisp/gnus/wry.pbm rename to etc/images/smilies/wry.pbm diff --git a/lisp/gnus/wry.xpm b/etc/images/smilies/wry.xpm similarity index 100% rename from lisp/gnus/wry.xpm rename to 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 + + * 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 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 @@ -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) -- 2.20.1