From 2f0e0dc8be44dba7d4cf8750844f1e8cbe22b740 Mon Sep 17 00:00:00 2001
From: Katsumi Yamaoka <yamaoka@jpl.org>
Date: Fri, 12 Nov 2010 05:59:53 +0000
Subject: [PATCH] gnus-art.el (article-treat-non-ascii): Keep text properties.
 gnus.texi (Article Washing): Fix typo.

---
 doc/misc/ChangeLog    |  4 ++++
 doc/misc/gnus.texi    |  4 ++--
 lisp/gnus/ChangeLog   |  4 ++++
 lisp/gnus/gnus-art.el | 10 +++++++---
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index d878a017855..1069a42513a 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus.texi (Article Washing): Fix typo.
+
 2010-11-11  Noorul Islam  <noorul@noorul.com>
 
 	* org.texi: Fix typo
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 9afbc67877d..2bab960f0a7 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -9664,8 +9664,8 @@ an attempt to provide more quoting characters.  If you see something
 like @code{\222} or @code{\264} where you're expecting some kind of
 apostrophe or quotation mark, then try this wash.
 
-@item W A
-@kindex W A (Summary)
+@item W U
+@kindex W U (Summary)
 @findex gnus-article-treat-non-ascii
 @cindex Unicode
 @cindex Non-@acronym{ASCII}
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 64752711f98..11118ed1ed7 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-art.el (article-treat-non-ascii): Keep text properties.
+
 2010-11-11  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* mm-decode.el (mm-dissect-buffer): Pass sender's mail address to
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 82de5b46475..a5d9a279ddb 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2130,14 +2130,18 @@ try this wash."
     (save-excursion
       (when (article-goto-body)
 	(let ((inhibit-read-only t)
-	      replace)
+	      replace props)
 	  (while (not (eobp))
 	    (if (not (setq replace (if (featurep 'xemacs)
 				       (get-char-table (following-char) table)
 				     (aref table (following-char)))))
 		(forward-char 1)
-	      (delete-char 1)
-	      (insert replace))))))))
+	      (if (prog1
+		      (setq props (text-properties-at (point)))
+		    (delete-char 1))
+		  (add-text-properties (point) (progn (insert replace) (point))
+				       props)
+		(insert replace)))))))))
 
 (defun article-translate-characters (from to)
   "Translate all characters in the body of the article according to FROM and TO.