From 196517b360cd2a7accc337daaf67eeb99872dda6 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Tue, 1 Jan 2002 12:33:10 +0000 Subject: [PATCH] * gnus-picon.el (gnus-picon-find-face): Search MISC for all types. (gnus-picon-transform-address): Search for unknown faces as well. --- lisp/ChangeLog | 3 +++ lisp/gnus-picon.el | 22 +++++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 259cb1b7f..122326b96 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2002-01-01 Lars Magne Ingebrigtsen + * gnus-picon.el (gnus-picon-find-face): Search MISC for all types. + (gnus-picon-transform-address): Search for unknown faces as well. + * gnus-sum.el (gnus-summary-hide-all-threads): Reversed logic. * gnus-picon.el (gnus-picon-find-face): Search through all diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el index 20e30a510..d29d2e590 100644 --- a/lisp/gnus-picon.el +++ b/lisp/gnus-picon.el @@ -60,7 +60,8 @@ see http://www.cs.indiana.edu/picons/ftp/index.html" :type '(repeat string) :group 'picon) -(defcustom gnus-picon-user-directories '("users" "usenix" "local" "misc") +(defcustom gnus-picon-user-directories '("users" "usenix" "local" + "misc" "unknown") "*List of directories to search for user faces." :type '(repeat string) :group 'picon) @@ -116,9 +117,6 @@ List of pairs (KEY . GLYPH) where KEY is either a filename or an URL.") (dolist (directory directories) (setq address faddress base (expand-file-name directory database)) - ;; Kludge to search misc/MISC for users. - (when (string= directory "misc") - (setq address '("MISC"))) (while address (when (setq result (gnus-picon-find-image (concat base "/" (mapconcat 'identity @@ -128,7 +126,11 @@ List of pairs (KEY . GLYPH) where KEY is either a filename or an URL.") (throw 'found result)) (if exact (setq address nil) - (pop address)))))))) + (pop address))) + ;; Kludge to search MISC as well. + (when (setq result (gnus-picon-find-image + (concat base "/MISC/" user "/"))) + (throw 'found result))))))) (defun gnus-picon-find-image (directory) (let ((types gnus-picon-file-types) @@ -166,10 +168,16 @@ GLYPH can be either a glyph or a string." first t) (when (and (stringp address) (setq spec (gnus-picon-split-address address))) - (when (setq file (gnus-picon-find-face - address gnus-picon-user-directories)) + (when (setq file (or (gnus-picon-find-face + address gnus-picon-user-directories) + (gnus-picon-find-face + (concat "unknown@" + (mapconcat + 'identity (cdr spec) ".")) + 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@" -- 2.25.1