X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-picon.el;h=9a4c9ba4f28529ca56adf55b731356e4ff195b1f;hb=9f54864189aa44a4ff8c03fe39fc4b547bd7c061;hp=36857325a83e90c054385536c66b804689b71a13;hpb=30d9f23f0291edcefeca1958befadb992d2982b5;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el
index 3685732..9a4c9ba 100644
--- a/lisp/gnus-picon.el
+++ b/lisp/gnus-picon.el
@@ -1,5 +1,7 @@
 ;;; gnus-picon.el --- displaying pretty icons in Gnus
-;; Copyright (C) 1996,97,98,99 Free Software Foundation, Inc.
+
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000
+;;      Free Software Foundation, Inc.
 
 ;; Author: Wes Hardaker <hardaker@ece.ucdavis.edu>
 ;; Keywords: news xpm annotation glyph faces
@@ -25,6 +27,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'gnus)
 ;; (require 'xpm)
 (require 'annotations)
@@ -96,9 +100,9 @@ Some people may want to add \"unknown\" to this list."
   (when (featurep 'x)
     (let ((types (list "xbm")))
       (when (featurep 'gif)
-	(push "gif" types))
+	(setq types (cons "gif" types)))
       (when (featurep 'xpm)
-	(push "xpm" types))
+	(setq types (cons "xpm" types)))
       types))
   "*List of suffixes on picon file names to try."
   :type '(repeat string)
@@ -254,8 +258,9 @@ arguments necessary for the job.")
     (when (and (featurep 'xpm)
 	       (or (not (fboundp 'device-type)) (equal (device-type) 'x))
 	       (setq from (mail-fetch-field "from"))
-	       (setq from (downcase (or (cadr (mail-extract-address-components
-					       from))
+	       (setq from (downcase (or (cadr
+					 (funcall gnus-extract-address-components
+						  from))
 					"")))
 	       (or (setq at-idx (string-match "@" from))
 		   (setq at-idx (length from))))
@@ -522,8 +527,8 @@ none, and whose CDR is the corresponding element of DOMAINS."
 (defun gnus-picons-parse-value (name)
   (goto-char (point-min))
   (if (re-search-forward (concat "<strong>"
-			     (regexp-quote name)
-			     "</strong> *= *<kbd> *\\([^ <][^<]*\\) *</kbd>")
+				 (regexp-quote name)
+				 "</strong> *= *<kbd> *\\([^ <][^<]*\\) *</kbd>")
 			 nil t)
       (buffer-substring (match-beginning 1) (match-end 1))))
 
@@ -694,8 +699,8 @@ none, and whose CDR is the corresponding element of DOMAINS."
 (defun gnus-picons-network-search (user addrs dbs sym-ann right-p marker)
   (let* ((host (mapconcat 'identity addrs "."))
 	 (key (list (or user "unknown") host (if user
-						  gnus-picons-user-directories
-						dbs)))
+						 gnus-picons-user-directories
+					       dbs)))
 	 (cache (assoc key gnus-picons-url-alist)))
     (if (null cache)
 	(gnus-picons-url-retrieve