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

	* gnus-ems.el (gnus-article-display-xface): Show xface in the
	order of headers (Actually, it is called in a reversed order). Add
	'gnus-image-text-deletable property.
	(gnus-remove-image): Remove text with such a property.

	* gnus-xmas.el (gnus-xmas-article-display-xface): Don't use
	gnus-put-image.

	* gnus-art.el (gnus-article-treat-fold-newsgroups): Replace ", *"
	with ", "

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac9c98d..a5ce248 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2002-01-02  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-ems.el (gnus-article-display-xface): Show xface in the
+       order of headers (Actually, it is called in a reversed order). Add
+       'gnus-image-text-deletable property.
+       (gnus-remove-image): Remove text with such a property.
+
+       * gnus-xmas.el (gnus-xmas-article-display-xface): Don't use
+       gnus-put-image.
+       
+       * gnus-art.el (gnus-article-treat-fold-newsgroups): Replace ", *"
+       with ", "
+
 2002-01-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-fun.el (gnus-convert-gray-x-face-to-xpm): Renamed.
@@ -21,7 +34,7 @@
        temporary files.
        (gnus-xmas-put-image): Use end-glyph. Make text invisible.
        (gnus-xmas-remove-image): Make text visible, remove glyph.
-       
+
        * gnus-picon.el (gnus-picon-transform-newsgroups)
        (gnus-picon-transform-address): Insert spec backward, due to the
        incompatibility of gnus-xmas-put-image.

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index fd122d7..f02d31c 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1700,7 +1700,7 @@ unfolded."
     (while (gnus-article-goto-header "newsgroups\\|followup-to")
       (save-restriction
        (mail-header-narrow-to-field)
-       (while (search-forward "," nil t)
+       (while (re-search-forward ", *" nil t)
          (replace-match ", " t t))
        (mail-header-fold-field)
        (goto-char (point-max))))))

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index 4a17687..12a4121 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -283,11 +283,11 @@ for XEmacs."
        (when image
          (goto-char (point-min))
          (re-search-forward "^From:" nil 'move)
-         (while (get-text-property (point) 'display)
-           (goto-char (next-single-property-change (point) 'display)))
          (gnus-add-wash-type 'xface)
          (gnus-add-image 'xface image)
-         (insert-image image))))))
+         (insert-image image " ")
+         (put-text-property (1- (point)) (point) 
+                            'gnus-image-text-deletable t))))))
 
 ;;; Image functions.
 
@@ -304,7 +304,9 @@ for XEmacs."
 (defun gnus-remove-image (image)
   (dolist (position (message-text-with-property 'display))
     (when (equal (get-text-property position 'display) image)
-      (put-text-property position (1+ position) 'display nil))))
+      (put-text-property position (1+ position) 'display nil)
+      (if (get-text-property position 'gnus-image-text-deletable)
+         (delete-region position (1+ position))))))
 
 (provide 'gnus-ems)
 

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index eccc24a..8c86c92 100644 (file)
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -676,7 +676,11 @@ XEmacs compatibility workaround."
       (set-glyph-face xface-glyph 'gnus-x-face)
 
       (gnus-article-goto-header "from")
-      (gnus-put-image xface-glyph " ")
+      ;;(gnus-put-image xface-glyph " ")
+      (let ((extent (make-extent (1- (point)) (point))))
+       (set-extent-property extent 'gnus-image t)
+       (set-extent-property extent 'duplicable t)
+       (set-extent-property extent 'end-glyph xface-glyph))
       (gnus-add-wash-type 'xface)
       (gnus-add-image 'xface xface-glyph))))