(dgnushack-make-manifest): Fix info directory.

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

diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el
index f3365ee..e527523 100644 (file)
--- a/lisp/gnus-picon.el
+++ b/lisp/gnus-picon.el
@@ -25,6 +25,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (require 'gnus)
 ;; (require 'xpm)
 (require 'annotations)
@@ -96,9 +98,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)
@@ -325,7 +327,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 +508,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 +525,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 +697,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