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

* lisp/gnus.el: Add autoloads for x-face-e21.
* lisp/gnus-sum.el (gnus-summary-search-article-position-point): Search for
 `x-face-image' as well as `x-face-mule-bitmap-image'.
* lisp/gnus-art.el (gnus-article-x-face-command): Default to
 `x-face-decode-message-header' when Emacs 21 is running and x-face-e21 is
 installed.

;; By courtesy of KANEMATSU-san.
* lisp/gnus-art.el (gnus-treat-display-xface): Default to `head' when Emacs 21
 is running and compface command is available.

diff --git a/ChangeLog b/ChangeLog
index 85a3dad..6be5cd6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2000-11-22  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * lisp/gnus-vers.el (gnus-revision-number): Increment to 07.
+
+       * lisp/gnus.el: Add autoloads for x-face-e21.
+
+       * lisp/gnus-sum.el (gnus-summary-search-article-position-point):
+       Search for `x-face-image' as well as `x-face-mule-bitmap-image'.
+
+       * lisp/gnus-art.el (gnus-article-x-face-command): Default to
+       `x-face-decode-message-header' when Emacs 21 is running and
+       x-face-e21 is installed.
+
+2000-11-21  KANEMATSU Daiji <kanematu@sra.co.jp>
+
+       * lisp/gnus-art.el (gnus-treat-display-xface): Default to `head'
+       when Emacs 21 is running and compface command is available.
+
 2000-11-21  Katsumi Yamaoka <yamaoka@jpl.org>
 
        * lisp/message.el (message-send-mail-with-smtp): Use

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 1b438b9..288e8cd 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -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

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 0fd7048..7fb0358 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -7085,11 +7085,11 @@ If BACKWARD, search backward instead."
               (goto-char (, opoint)))))
       (` (let ((end (if (search-forward "\n\n" nil t)
                        (goto-char (1- (point)))
-                     (point-min))))
+                     (point-min)))
+              (start (or (search-backward "\n\n" nil t) (point-min))))
           (goto-char
-           (or (text-property-any (or (search-backward "\n\n" nil t)
-                                      (point-min))
-                                  end 'x-face-mule-bitmap-image t)
+           (or (text-property-any start end 'x-face-image t);; x-face-e21
+               (text-property-any start end 'x-face-mule-bitmap-image t)
                (, opoint)))))))
 
   (defmacro gnus-summary-search-article-highlight-matched-text

diff --git a/lisp/gnus-vers.el b/lisp/gnus-vers.el
index 4aa869d..2ffcc1b 100644 (file)
--- a/lisp/gnus-vers.el
+++ b/lisp/gnus-vers.el
@@ -31,7 +31,7 @@
 (require 'product)
 (provide 'gnus-vers)
 
-(defconst gnus-revision-number "06"
+(defconst gnus-revision-number "07"
   "Revision number for this version of gnus.")
 
 ;; Product information of this gnus.

diff --git a/lisp/gnus.el b/lisp/gnus.el
index d807a26..bfa7a98 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1889,7 +1889,9 @@ use the article treating faculties instead.  Is is described in Info node
   (unless (featurep 'xemacs)
     (autoload 'gnus-smiley-display "gnus-bitmap" nil t)
     (autoload 'smiley-toggle-buffer "gnus-bitmap")
-    (autoload 'x-face-mule-gnus-article-display-x-face "x-face-mule")))
+    (autoload 'x-face-mule-gnus-article-display-x-face "x-face-mule")
+    (when (>= emacs-major-version 21)
+      (autoload 'x-face-decode-message-header "x-face-e21"))))
 
 ;;; gnus-sum.el thingies