From: yamaoka Date: Tue, 19 Sep 2000 03:32:08 +0000 (+0000) Subject: Synch with the latest smiley-mule.el. X-Git-Tag: t-gnus-6_14_5-05~1 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a80a085b8a6a9581691c8d37acf404a03c4e8a0;p=elisp%2Fgnus.git- Synch with the latest smiley-mule.el. (gnus-copy-article-buffer): Encode bitmap smileys to ordinary text before removing any text properties. --- diff --git a/ChangeLog b/ChangeLog index 1f6373d..2861f34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-09-19 Katsumi Yamaoka + + * 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 * lisp/nnshimbun.el (nnshimbun-type-definition): Follow URL change diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index 34d7dbd..dfd03df 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -482,6 +482,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) @@ -501,10 +506,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)))