(utf-8-post-read-conversion): If the

buffer is unibyte, temporarily set it multibyte.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2141bcd959f711256ece4a231f1c1a56b03f624a..66ef44650d5f86c4fed4833a919a9f8253eb24aa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-27  Kenichi Handa  <handa@m17n.org>
+
+       * international/utf-8.el (utf-8-post-read-conversion): If the
+       buffer is unibyte, temporarily make it multibyte.
+
 2004-08-27  Masatake YAMATO  <jet@gyve.org>
 
        * calendar/time-date.el (time-to-seconds): Add autoload cookies.

diff --git a/lisp/international/utf-8.el b/lisp/international/utf-8.el
index bad79b58743178a95c02e64b531af6c09126b7dd..5a7acee0f0e929264320ca7d801731b0a0416882 100644 (file)
--- a/lisp/international/utf-8.el
+++ b/lisp/international/utf-8.el
@@ -870,7 +870,9 @@ Also compose particular scripts if `utf-8-compose-scripts' is non-nil."
       ;; version of the string in the loop, since it's always loaded as
       ;; unibyte from a byte-compiled file.
       (let ((range (string-as-multibyte "^\xc0-\xc3\xe1-\xf7"))
+           (buffer-multibyte enable-multibyte-characters)
            hash-table ch)
+       (set-buffer-multibyte t)
        (when utf-translate-cjk-mode
          (if (not utf-translate-cjk-lang-env)
              ;; Check these characters:
@@ -893,7 +895,9 @@ Also compose particular scripts if `utf-8-compose-scripts' is non-nil."
                (progn
                  (insert ch)
                  (delete-char 1))
-             (forward-char 1)))))
+             (forward-char 1))))
+       (or buffer-multibyte
+           (set-buffer-multibyte nil)))
 
       (when (and utf-8-compose-scripts (> length 1))
        ;; These currently have definitions which cover the relevant