From: yamaoka <yamaoka>
Date: Tue, 19 Sep 2000 03:32:46 +0000 (+0000)
Subject: Synch with `t-gnus-6_14'.
X-Git-Tag: t-gnus-6_14-quimby-before-installer-changed-~91
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=feeb525c525b10ac11bf04db9d559d78274a69ed;p=elisp%2Fgnus.git-

Synch with `t-gnus-6_14'.
---

diff --git a/ChangeLog b/ChangeLog
index 55c262f..cd2c6c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-19  Katsumi Yamaoka <yamaoka@jpl.org>
+
+	* lisp/gnus-msg.el (gnus-copy-article-buffer): Encode bitmap
+	smileys to ordinary text before removing any text properties.  It
+	is synchronized with the latest smiley-mule.el.
+
 2000-09-19  TSUCHIYA Masatoshi  <tsuchiya@pine.kuee.kyoto-u.ac.jp>
 
 	* lisp/nnshimbun.el (nnshimbun-type-definition): Follow URL change
diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 0e2ca25..84a89a6 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -496,6 +496,11 @@ header line with the old Message-ID."
 	  (let ((inhibit-read-only t))
 	    (copy-to-buffer gnus-article-copy (point-min) (point-max))
 	    (set-buffer gnus-article-copy)
+	    ;; Encode bitmap smileys to ordinary text.
+	    ;; Possibly, the original text might be restored.
+	    (static-unless (featurep 'xemacs)
+	      (when (featurep 'smiley-mule)
+		(smiley-encode-buffer)))
 	    (gnus-article-delete-text-of-type 'annotation)
 	    (gnus-remove-text-with-property 'gnus-prev)
 	    (gnus-remove-text-with-property 'gnus-next)
@@ -515,10 +520,6 @@ header line with the old Message-ID."
 	  (set-buffer gnus-article-copy)
 	  (delete-region (goto-char (point-min))
 			 (or (search-forward "\n\n" nil t) (point-max)))
-	  ;; Encode bitmap smileys to ordinary text.
-	  (static-unless (featurep 'xemacs)
-	    (when (featurep 'smiley-mule)
-	      (smiley-encode-buffer)))
 	  ;; Insert the original article headers.
 	  (insert-buffer-substring gnus-original-article-buffer beg end)
 	  (article-decode-encoded-words)))