X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-picon.el;h=188f07168fee71d70b5cd2b6919df703688bc3b3;hb=0fb3ca6ec4c82ed8de7880a455c20e47e6017b3a;hp=f27ab4eb257414adb2241b1164dd262895b161ab;hpb=6d7bb389f324e3b1dbcb8a40c27b628da4ff5e0c;p=gnus diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el index f27ab4eb2..188f07168 100644 --- a/lisp/gnus-picon.el +++ b/lisp/gnus-picon.el @@ -44,32 +44,21 @@ ;;; User variables: -(defgroup picon nil - "Show pictures of people, domains, and newsgroups." - :group 'gnus-visual) - -(defcustom gnus-picon-databases '("/usr/lib/picon" "/usr/local/faces") - "*Defines the location of the faces database. -For information on obtaining this database of pretty pictures, please -see http://www.cs.indiana.edu/picons/ftp/index.html" - :type 'directory - :group 'picon) - (defcustom gnus-picon-news-directories '("news") "*List of directories to search for newsgroups faces." :type '(repeat string) - :group 'picon) + :group 'gnus-picon) (defcustom gnus-picon-user-directories '("users" "usenix" "local" "misc") "*List of directories to search for user faces." :type '(repeat string) - :group 'picon) + :group 'gnus-picon) (defcustom gnus-picon-domain-directories '("domains") "*List of directories to search for domain faces. Some people may want to add \"unknown\" to this list." :type '(repeat string) - :group 'picon) + :group 'gnus-picon) (defcustom gnus-picon-file-types (let ((types (list "xbm"))) @@ -80,15 +69,15 @@ Some people may want to add \"unknown\" to this list." types) "*List of suffixes on picon file names to try." :type '(repeat string) - :group 'picon) + :group 'gnus-picon) (defface gnus-picon-xbm-face '((t (:foreground "black" :background "white"))) "Face to show xbm picon in." - :group 'picon) + :group 'gnus-picon) (defface gnus-picon-face '((t (:foreground "black" :background "white"))) "Face to show picon in." - :group 'picon) + :group 'gnus-picon) ;;; Internal variables: @@ -119,10 +108,10 @@ List of pairs (KEY . GLYPH) where KEY is either a filename or an URL.") base (expand-file-name directory database)) (while address (when (setq result (gnus-picon-find-image - (concat base "/" (mapconcat 'identity + (concat base "/" (mapconcat 'downcase (reverse address) "/") - "/" user "/"))) + "/" (downcase user) "/"))) (throw 'found result)) (if exact (setq address nil) @@ -179,7 +168,7 @@ GLYPH can be either a glyph or a string." gnus-picon-user-directories))) (setcar spec (cons (gnus-picon-create-glyph file) (car spec)))) - + (dotimes (i (1- (length spec))) (when (setq file (gnus-picon-find-face (concat "unknown@" @@ -191,7 +180,7 @@ GLYPH can be either a glyph or a string." (nth (1+ i) spec))))) (setq spec (nreverse spec)) (push (cons address spec) gnus-picon-cache)) - + (gnus-article-goto-header header) (mail-header-narrow-to-field) (when (search-forward address nil t)