Feeding back from `t-gnus-6_14' into `pgnus-ichikawa'.

[elisp/gnus.git-] / lisp / gnus-picon.el

diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el
index f3365ee..0a8d804 100644 (file)
--- 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)
@@ -254,9 +258,8 @@ 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
-                                        (funcall gnus-extract-address-components
-                                                 from))
+              (setq from (downcase (or (cadr (mail-extract-address-components
+                                              from))
                                        "")))
               (or (setq at-idx (string-match "@" from))
                   (setq at-idx (length from))))
@@ -325,7 +328,7 @@ arguments necessary for the job.")
                (let ((article-goto-body-goes-to-point-min-p nil))
                  (article-goto-body))
                (unless (bobp)
-                 (forward-char -1)))))
+                 (backward-char 1)))))
          (if (null gnus-picons-piconsearch-url)
              (gnus-picons-display-pairs
               (gnus-picons-lookup-pairs
@@ -506,8 +509,7 @@ none, and whose CDR is the corresponding element of DOMAINS."
                                        nil 'quiet)
                          (prog1 (make-glyph (vector 'xbm :file fname))
                            (delete-file fname))))
-       (t (make-glyph (vector type :data (buffer-substring
-                                          (point-min) (point-max)))))))
+       (t (make-glyph (vector type :data (buffer-string))))))
 
 ;;; Parsing of piconsearch result page.
 
@@ -524,8 +526,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))))
 
@@ -696,8 +698,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