2002-01-04 ShengHuo ZHU <zsh@cs.rochester.edu>

	* gnus-ems.el (gnus-put-image): Really return glyph.

	* gnus-art.el (gnus-article-x-face-command): Fix :type.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42d3599..dc66d1a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-04  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-ems.el (gnus-put-image): Really return glyph.
+
+       * gnus-art.el (gnus-article-x-face-command): Fix :type.
+
 2002-01-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * compface.el (uncompface): XEmacs and Emacs have differing

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 34e7a6f..08f1bf3 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -239,10 +239,7 @@ display -"))
 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
-                 ,(if (featurep 'xemacs)
-                      'gnus-xmas-article-display-xface
-                    'gnus-article-display-xface))
+                (function-item gnus-display-x-face-in-from)
                 function)
   :version "21.1"
   :group 'gnus-article-washing)

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index 732fbe5..f3fd5a9 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -226,7 +226,8 @@
   (insert-image glyph (or string " "))
   (unless string
     (put-text-property (1- (point)) (point) 
-                      'gnus-image-text-deletable t)))
+                      'gnus-image-text-deletable t))
+  glyph)
 
 (defun gnus-remove-image (image)
   (dolist (position (message-text-with-property 'display))