projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Gnus -- minor build / warning fixes [OK For Upstream]
[gnus]
/
lisp
/
gnus-picon.el
diff --git
a/lisp/gnus-picon.el
b/lisp/gnus-picon.el
index
e1ee6b7
..
c58059f
100644
(file)
--- a/
lisp/gnus-picon.el
+++ b/
lisp/gnus-picon.el
@@
-1,7
+1,6
@@
;;; gnus-picon.el --- displaying pretty icons in Gnus
;;; gnus-picon.el --- displaying pretty icons in Gnus
-;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1996-2016 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news xpm annotation glyph faces
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news xpm annotation glyph faces
@@
-72,6
+71,12
@@
Some people may want to add \"unknown\" to this list."
:type '(repeat string)
:group 'gnus-picon)
:type '(repeat string)
:group 'gnus-picon)
+(defcustom gnus-picon-properties '(:color-symbols (("None" . "white")))
+ "List of image properties applied to picons."
+ :type 'sexp
+ :version "24.3"
+ :group 'gnus-picon)
+
(defcustom gnus-picon-style 'inline
"How should picons be displayed.
If `inline', the textual representation is replaced. If `right', picons are
(defcustom gnus-picon-style 'inline
"How should picons be displayed.
If `inline', the textual representation is replaced. If `right', picons are
@@
-81,21
+86,15
@@
added right to the textual representation."
(const right))
:group 'gnus-picon)
(const right))
:group 'gnus-picon)
-(defface gnus-picon-xbm '((t (:foreground "black" :background "white")))
- "Face to show xbm picon in."
+(defcustom gnus-picon-inhibit-top-level-domains t
+ "If non-nil, don't piconify top-level domains.
+These are often not very interesting."
+ :version "24.1"
+ :type 'boolean
:group 'gnus-picon)
:group 'gnus-picon)
-;; backward-compatibility alias
-(put 'gnus-picon-xbm-face 'face-alias 'gnus-picon-xbm)
-
-(defface gnus-picon '((t (:foreground "black" :background "white")))
- "Face to show picon in."
- :group 'gnus-picon)
-;; backward-compatibility alias
-(put 'gnus-picon-face 'face-alias 'gnus-picon)
;;; Internal variables:
;;; Internal variables:
-(defvar gnus-picon-setup-p nil)
(defvar gnus-picon-glyph-alist nil
"Picon glyphs cache.
List of pairs (KEY . GLYPH) where KEY is either a filename or an URL.")
(defvar gnus-picon-glyph-alist nil
"Picon glyphs cache.
List of pairs (KEY . GLYPH) where KEY is either a filename or an URL.")
@@
-114,7
+113,7
@@
List of pairs (KEY . GLYPH) where KEY is either a filename or an URL.")
(let* ((address (gnus-picon-split-address address))
(user (pop address))
(faddress address)
(let* ((address (gnus-picon-split-address address))
(user (pop address))
(faddress address)
-
database directory result instance
base)
+
result
base)
(catch 'found
(dolist (database gnus-picon-databases)
(dolist (directory directories)
(catch 'found
(dolist (database gnus-picon-databases)
(dolist (directory directories)
@@
-160,11
+159,15
@@
replacement is added."
(defun gnus-picon-create-glyph (file)
(or (cdr (assoc file gnus-picon-glyph-alist))
(defun gnus-picon-create-glyph (file)
(or (cdr (assoc file gnus-picon-glyph-alist))
- (cdar (push (cons file (gnus-create-image file))
+ (cdar (push (cons file (apply 'gnus-create-image
+ file nil nil
+ gnus-picon-properties))
gnus-picon-glyph-alist))))
;;; Functions that does picon transformations:
gnus-picon-glyph-alist))))
;;; Functions that does picon transformations:
+(declare-function image-size "image.c" (spec &optional pixels frame))
+
(defun gnus-picon-transform-address (header category)
(gnus-with-article-headers
(let ((addresses
(defun gnus-picon-transform-address (header category)
(gnus-with-article-headers
(let ((addresses
@@
-193,7
+196,9
@@
replacement is added."
(setcar spec (cons (gnus-picon-create-glyph file)
(car spec))))
(setcar spec (cons (gnus-picon-create-glyph file)
(car spec))))
- (dotimes (i (1- (length spec)))
+ (dotimes (i (- (length spec)
+ (if gnus-picon-inhibit-top-level-domains
+ 2 1)))
(when (setq file (gnus-picon-find-face
(concat "unknown@"
(mapconcat
(when (setq file (gnus-picon-find-face
(concat "unknown@"
(mapconcat
@@
-244,7
+249,7
@@
replacement is added."
(gnus-article-goto-header header)
(mail-header-narrow-to-field)
(let ((groups (message-tokenize-header (mail-fetch-field header)))
(gnus-article-goto-header header)
(mail-header-narrow-to-field)
(let ((groups (message-tokenize-header (mail-fetch-field header)))
- spec file
point
)
+ spec file)
(dolist (group groups)
(unless (setq spec (cdr (assoc group gnus-picon-cache)))
(setq spec (nreverse (split-string group "[.]")))
(dolist (group groups)
(unless (setq spec (cdr (assoc group gnus-picon-cache)))
(setq spec (nreverse (split-string group "[.]")))
@@
-311,5
+316,4
@@
If picons are already displayed, remove them."
(provide 'gnus-picon)
(provide 'gnus-picon)
-;; arch-tag: fe9aede0-1b1b-463a-b4ab-807f98bcb31f
;;; gnus-picon.el ends here
;;; gnus-picon.el ends here