* lisp/gnus-vers.el (gnus-revision-number): Increment to 07.

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

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 14981af..288e8cd 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -37,6 +37,7 @@
 (require 'gnus-int)
 (require 'alist)
 (require 'mime-view)
+(require 'wid-edit)
 
 ;; Avoid byte-compile warnings.
 (eval-when-compile
@@ -44,7 +45,6 @@
   (require 'mail-parse)
   (require 'mm-decode)
   (require 'mm-view)
-  (require 'wid-edit)
   (require 'mm-uu)
   )
 
@@ -214,7 +214,9 @@ regexp.  If it matches, the text in question is not a signature."
    ;; non-graphical frames in a session.
    ((and (fboundp 'image-type-available-p)
         (image-type-available-p 'xbm))
-    'gnus-article-display-xface)
+    (if (module-installed-p 'x-face-e21)
+       'x-face-decode-message-header
+      'gnus-article-display-xface))
    ((and (not gnus-xemacs)
         window-system
         (module-installed-p 'x-face-mule))
@@ -225,6 +227,9 @@ regexp.  If it matches, the text in question is not a signature."
 If it is a string, the command will be executed in a sub-shell
 asynchronously.         The compressed face will be piped to this command."
   :type '(choice string
+                (function-item
+                 :tag "x-face-decode-message-header (x-face-e21)"
+                 x-face-decode-message-header)
                 (function-item gnus-article-display-xface)
                 (function-item x-face-mule-gnus-article-display-x-face)
                 function)
@@ -901,7 +906,10 @@ See the manual for details."
 (put 'gnus-treat-overstrike 'highlight t)
 
 (defcustom gnus-treat-display-xface
-  (if (or (and gnus-xemacs (featurep 'xface))
+  (if (or (and (fboundp 'image-type-available-p)
+              (image-type-available-p 'xbm)
+              (string-match "^0x" (shell-command-to-string "uncompface")))
+         (and gnus-xemacs (featurep 'xface))
          (eq 'x-face-mule-gnus-article-display-x-face
              gnus-article-x-face-command))
       'head
@@ -4861,7 +4869,9 @@ specified by `gnus-button-alist'."
          (list 'gnus-callback fun)
          (and data (list 'gnus-data data))))
   (widget-convert-button 'link from to :action 'gnus-widget-press-button
-                        :button-keymap gnus-widget-button-keymap))
+                        ;; Quote `:button-keymap' for Mule 2.3
+                        ;; but it won't work.
+                        ':button-keymap gnus-widget-button-keymap))
 
 ;;; Internal functions: