*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ae3976f..ddc53b1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,16 @@
-Mon Jun 10 03:08:10 1996  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+Mon Jun 10 05:20:24 1996  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+
+       * gnus-cus.el (()): Display X face by default.
+
+       * gnus-xmas.el (gnus-article-x-face-command): New default.
+
+       * gnus-ems.el: Moved x-face.
+
+       * gnus-xmas.el (gnus-xmas-article-display-xface): New function.
+
+Mon Jun 10 03:08:10 1996  Lars Magne Ingebrigtsen  <larsi@ifi.uido.no>
+
+       * gnus.el: Gnus v5.2.13 is released.
 
        * gnus-cus.el (()): Changed LemonChiffon to Turquoise.
 

diff --git a/lisp/gnus-cus.el b/lisp/gnus-cus.el
index 053a281..f95628e 100644 (file)
--- a/lisp/gnus-cus.el
+++ b/lisp/gnus-cus.el
@@ -123,10 +123,18 @@ parts of the article, making it easier to find the information you
 want.")
        (name . gnus-article-display-hook)
        (type . list)
-       (default . (gnus-article-hide-headers-if-wanted
-                   gnus-article-hide-boring-headers
-                   gnus-article-treat-overstrike
-                   gnus-article-maybe-highlight))
+       (calculate 
+        . (if (and (string-match "xemacs" emacs-version)
+                   (featurep 'xface))
+              '(gnus-article-hide-headers-if-wanted
+               gnus-article-hide-boring-headers
+               gnus-article-treat-overstrike
+               gnus-article-display-x-face
+               gnus-article-maybe-highlight)
+            '(gnus-article-hide-headers-if-wanted
+             gnus-article-hide-boring-headers
+             gnus-article-treat-overstrike
+             gnus-article-maybe-highlight)))
        (data 
         ((type . repeat)
          (header . nil)

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index 8613af3..c8a9ea3 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -88,6 +88,12 @@
     (defvar gnus-mouse-face-prop 'mouse-face
       "Property used for highlighting mouse regions.")
 
+    (defvar gnus-article-x-face-command
+      "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | xv -quit -"
+      "String or function to be executed to display an X-Face header.
+If it is a string, the command will be executed in a sub-shell
+asynchronously.         The compressed face will be piped to this command.")
+
     ;; Added by Per Abrahamsen <amanda@iesd.auc.dk>.
     (defvar gnus-display-type 
       (condition-case nil

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index e040831..da5fb09 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -57,6 +57,14 @@ automatically.")
   (cdr (assq gnus-xmas-logo-color-style gnus-xmas-logo-color-alist))
   "Colors used for the Gnus logo.")
 
+(defvar gnus-article-x-face-command
+  (if (featurep 'xface)
+      'gnus-xmas-article-display-xface
+    "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | xv -quit -")
+  "String or function to be executed to display an X-Face header.
+If it is a string, the command will be executed in a sub-shell
+asynchronously.         The compressed face will be piped to this command.")
+
 ;;; Internal variables.
 
 ;; Don't warn about these undefined variables.
@@ -664,4 +672,19 @@ XEmacs compatibility workaround."
       nil
     (mail-strip-quoted-names address)))
 
+(defun gnus-xmas-article-display-xface (beg end)
+  "Display any XFace headers in the current article."
+  (save-excursion
+    (let (xface-glyph)
+      (when (featurep 'xface)
+       (setq xface-glyph
+             (make-glyph (vector 'xface :data 
+                                 (concat "X-Face: "
+                                         (buffer-substring beg end)))))
+       (goto-char (point-min))
+       (re-search-forward "^From:" nil t)
+       (beginning-of-line)
+       (set-extent-begin-glyph 
+        (make-extent (point) (point)) xface-glyph)))))
+
 ;;; gnus-xmas.el ends here

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 20840d1..89ca701 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -1426,12 +1426,6 @@ If you want to run a special decoding program like nkf, use this hook.")
 ;(add-hook 'gnus-article-display-hook 'gnus-article-treat-overstrike)
 ;(add-hook 'gnus-article-display-hook 'gnus-article-maybe-highlight)
 
-(defvar gnus-article-x-face-command
-  "{ echo '/* Width=48, Height=48 */'; uncompface; } | icontopbm | xv -quit -"
-  "String or function to be executed to display an X-Face header.
-If it is a string, the command will be executed in a sub-shell
-asynchronously.         The compressed face will be piped to this command.")
-
 (defvar gnus-article-x-face-too-ugly nil
   "Regexp matching posters whose face shouldn't be shown automatically.")
 
@@ -1732,7 +1726,7 @@ variable (string, integer, character, etc).")
   "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)"
   "The mail address of the Gnus maintainers.")
 
-(defconst gnus-version-number "5.2.13"
+(defconst gnus-version-number "5.2.14"
   "Version number for this version of Gnus.")
 
 (defconst gnus-version (format "Gnus v%s" gnus-version-number)

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 2abda77..0a9fc20 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -5202,7 +5202,10 @@ function is given by the @code{gnus-article-x-face-command} variable.  If
 this variable is a string, this string will be executed in a sub-shell.
 If it is a function, this function will be called with the face as the
 argument.  If the @code{gnus-article-x-face-too-ugly} (which is a regexp)
-matches the @code{From} header, the face will not be shown.
+matches the @code{From} header, the face will not be shown.  The default
+action under Emacs is to fork off an @code{xv} to view the face; under
+XEmacs the default action is to display the face after the @code{From}
+header. 
 
 @item W b
 @kindex W b (Summary)