auth-source.el (auth-source-create): Query the user for whether to store the credentials.

auth-source.el: Require netrc.
nnml.el (nnml-open-nov): Don't return dead buffers.
gnus-picon.el (gnus-picon-xbm): Removed obsolete face.
gnus-picon.el (gnus-picon-insert-glyph): Make the background white.
gnus-art.el (gnus-treatment-function-alist): Insert picons after doing the header highlightling.

1 files changed, 3 insertions, 11 deletions

diff --git a/lisp/gnus/gnus-picon.el b/lisp/gnus/gnus-picon.el
index fb23d9056ed..2f70eae3cd0 100644
--- a/lisp/gnus/gnus-picon.el
+++ b/lisp/gnus/gnus-picon.el
@@ -85,19 +85,9 @@ added right to the textual representation."
 		 (const right))
   :group 'gnus-picon)
 
-(defface gnus-picon-xbm '((t (:foreground "black" :background "white")))
-  "Face to show xbm picon in."
-  :group 'gnus-picon)
-;; backward-compatibility alias
-(put 'gnus-picon-xbm-face 'face-alias 'gnus-picon-xbm)
-(put 'gnus-picon-xbm-face 'obsolete-face "22.1")
-
 (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)
-(put 'gnus-picon-face 'obsolete-face "22.1")
 
 ;;; Internal variables:
 
@@ -161,7 +151,9 @@ replacement is added."
       (insert glyph)
     (gnus-add-wash-type category)
     (gnus-add-image category (car glyph))
-    (gnus-put-image (car glyph) (unless nostring (cdr glyph)) category)))
+    (let ((start (point)))
+      (gnus-put-image (car glyph) (unless nostring (cdr glyph)) category)
+      (put-text-property start (point) 'face 'gnus-picon))))
 
 (defun gnus-picon-create-glyph (file)
   (or (cdr (assoc file gnus-picon-glyph-alist))