diff lisp/gnus/gnus-art.el @ 74984:21f28d10d73a

Merge from gnus--rel--5.10 Patches applied: * gnus--rel--5.10 (patch 179-183) - Update from CVS 2006-12-25 Daiki Ueno <[e-mail]> * lisp/pgg-def.el (pgg-passphrase-coding-system): Default to nil instead of locale-coding-system. * lisp/pgg-gpg.el (pgg-gpg-process-region): Encode passphrase with eol-type LF. 2006-12-29 Jouni K. Sepp,Ad(Bnen <[e-mail]> * lisp/gnus/nnimap.el (nnimap-expunge-search-string): Mention nnimap-search-uids-not-since-is-evil in docstring. 2006-12-28 Reiner Steib <[e-mail]> * lisp/gnus/spam.el: Revert to make-obsolete-variable because define-obsolete-variable-alias is not supported in Emacs 21. 2006-12-28 Daiki Ueno <[e-mail]> * lisp/gnus/gnus-sum.el (gnus-summary-next-article): Make sure we are in the summary buffer. 2006-12-27 Reiner Steib <[e-mail]> * lisp/gnus/spam.el (spam-ifile-path, spam-ifile-database-path) (spam-bogofilter-path): Use define-obsolete-variable-alias instead of make-obsolete-variable. 2006-12-26 Reiner Steib <[e-mail]> * lisp/gnus/message.el (message-make-fqdn): Fix comment. (message-bogus-system-names): Add ".local". * lisp/gnus/spam.el (spam-ifile-path, spam-ifile-program) (spam-ifile-database-path, spam-ifile-database) (spam-bogofilter-path, spam-bogofilter-program): Rename variables. Don't use "path" inappropriately. (spam-spamoracle-database, spam-get-ifile-database-parameter): Fix doc strings. (spam-check-ifile, spam-ifile-register-with-ifile) (spam-check-bogofilter, spam-bogofilter-register-with-bogofilter): Use new variable names. * lisp/gnus/gnus-art.el (gnus-treat-display-x-face, gnus-treat-display-face) (gnus-treat-display-smileys): Simplify using gnus-image-type-available-p. * lisp/gnus/gnus-ems.el (gnus-image-type-available-p): Use display-images-p if available. 2006-12-22 Katsumi Yamaoka <[e-mail]> * lisp/gnus/nnrss.el (nnrss-fetch): Replace buffer's contents with the decoded one after turning on the buffer's multibyteness instead of decoding them directly in the unibyte buffer that causes unexpected conversion in Emacs 23 (unicode). 2006-12-29 Reiner Steib <[e-mail]> * man/gnus.texi (Customizing Articles): Add index entries for all gnus-treat-* variables. 2006-12-29 Jouni K. Sepp,Ad(Bnen <[e-mail]> * man/gnus.texi (IMAP): Fix incorrect explanation of nnimap-search-uids-not-since-is-evil in documentation for nnimap-expunge-search-string. 2006-12-27 Reiner Steib <[e-mail]> * man/gnus.texi (ifile spam filtering): Rename spam-ifile-database-path to spam-ifile-database. 2006-12-26 Reiner Steib <[e-mail]> * man/gnus.texi (Spam Package Configuration Examples): Don't encourage to rebind C-s. 2006-12-26 Jouni K. Sepp,Ad(Bnen <[e-mail]> * man/gnus.texi (Group Parameters, Group Maintenance, Topic Commands) (Mail Group Commands, Expiring Mail, IMAP): Add index entries for "expiring mail". (IMAP): Document nnimap-search-uids-not-since-is-evil and nnimap-nov-is-evil. Revision: [e-mail]/emacs--devo--0--patch-576

--- a/lisp/gnus/gnus-art.el	Sat Dec 30 15:23:38 2006 +0000
+++ b/lisp/gnus/gnus-art.el	Sat Dec 30 15:34:42 2006 +0000
@@ -1325,12 +1325,11 @@
 
 (defcustom gnus-treat-display-x-face
   (and (not noninteractive)
-       (or (and (fboundp 'image-type-available-p)
-		(image-type-available-p 'xbm)
-		(string-match "^0x" (shell-command-to-string "uncompface"))
-		(executable-find "icontopbm"))
-	   (and (featurep 'xemacs)
-		(featurep 'xface)))
+       (gnus-image-type-available-p 'xbm)
+       (if (featurep 'xemacs)
+	   (featurep 'xface)
+	 (and (string-match "^0x" (shell-command-to-string "uncompface"))
+	      (executable-find "icontopbm")))
        'head)
   "Display X-Face headers.
 Valid values are nil, t, `head', `last', an integer or a predicate.
@@ -1362,10 +1361,7 @@
 
 (defcustom gnus-treat-display-face
   (and (not noninteractive)
-       (or (and (fboundp 'image-type-available-p)
-		(image-type-available-p 'png))
-	   (and (featurep 'xemacs)
-		(featurep 'png)))
+       (gnus-image-type-available-p 'png)
        'head)
   "Display Face headers.
 Valid values are nil, t, `head', `last', an integer or a predicate.
@@ -1378,12 +1374,7 @@
   :type gnus-article-treat-head-custom)
 (put 'gnus-treat-display-face 'highlight t)
 
-(defcustom gnus-treat-display-smileys
-  (if (or (and (featurep 'xemacs)
-	       (featurep 'xpm))
-	  (and (fboundp 'image-type-available-p)
-	       (image-type-available-p 'pbm)))
-      t nil)
+(defcustom gnus-treat-display-smileys (gnus-image-type-available-p 'xpm)
   "Display smileys.
 Valid values are nil, t, `head', `last', an integer or a predicate.
 See Info node `(gnus)Customizing Articles' and Info node