projects
/
elisp
/
gnus.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sync with Oort Gnus (Translating gnus-ja.texi has not been done yet).
[elisp/gnus.git-]
/
lisp
/
gnus-picon.el
diff --git
a/lisp/gnus-picon.el
b/lisp/gnus-picon.el
index
c0163fc
..
9a4c9ba
100644
(file)
--- a/
lisp/gnus-picon.el
+++ b/
lisp/gnus-picon.el
@@
-1,5
+1,7
@@
;;; gnus-picon.el --- displaying pretty icons in Gnus
;;; 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
;; Author: Wes Hardaker <hardaker@ece.ucdavis.edu>
;; Keywords: news xpm annotation glyph faces
@@
-25,6
+27,8
@@
;;; Code:
;;; Code:
+(eval-when-compile (require 'cl))
+
(require 'gnus)
;; (require 'xpm)
(require 'annotations)
(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)
(when (featurep 'x)
(let ((types (list "xbm")))
(when (featurep 'gif)
- (push "gif" types))
+ (setq types (cons "gif" types)))
(when (featurep 'xpm)
(when (featurep 'xpm)
- (push "xpm" types))
+ (setq types (cons "xpm" types)))
types))
"*List of suffixes on picon file names to try."
:type '(repeat string)
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"))
(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))))
"")))
(or (setq at-idx (string-match "@" from))
(setq at-idx (length from))))