Synch to semi-1_14.

diff --git a/ChangeLog b/ChangeLog
index 292c3ba..31a623e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mime-edit.el (mime-edit-normalize-body): Fix a comment that the
+       problem related to `replace-match' has been fixed at 2004-01-15,
+       thanks to Handa-san.
+
 2003-12-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mime-edit.el (mime-edit-normalize-body): Don't use the

diff --git a/mime-edit.el b/mime-edit.el
index 9195374..1e19f6f 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -2111,9 +2111,10 @@ Content-Transfer-Encoding: 7bit
                    (narrow-to-region beg (mime-edit-content-end))
                    (goto-char beg)
                    (while (re-search-forward "\\(\\=\\|[^\r]\\)\n" nil t)
-                     ;; Don't use this in the multibyte buffer since it may
-                     ;; convert the unibyte string into multibyte.
-                     ;;;;(replace-match "\\1\r\n"))))
+                     ;; In a certain period, `replace-match' with "\\N"
+                     ;; converted 8-bit characters into multibyte string,
+                     ;; but it has been fixed at 2004-01-15.
+                     ;;(replace-match "\\1\r\n"))))
                      (backward-char 1)
                      (insert "\r")
                      (forward-char 1))))