(select-safe-coding-system): Don't

check consistency with coding: spec, etc if raw-text or
no-conversion was found to be safe.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c69788b38d496fc4dd67ad2b591f9b6fd559f870..8820980bf7df6fbc0c15513b6ca8df36037df85d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-25  Kenichi Handa  <handa@m17n.org>
+
+       * international/mule-cmds.el (select-safe-coding-system): Don't
+       check consistency with coding: spec, etc if raw-text or
+       no-conversion was found to be safe.
+
 2005-04-24  Richard M. Stallman  <rms@gnu.org>
 
        * mail/sendmail.el (mail-font-lock-keywords): Match any number of

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index b4f78918ef1c3e21ac4dc09c48e4450555a74e64..39cb1d05ca33f028bcdc35c3113c736fcda7c7fb 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -927,7 +927,9 @@ and TO is ignored."
     ;; give when file is re-read.
     ;; But don't do this if we explicitly ignored the cookie
     ;; by using `find-file-literally'.
-    (unless (or (stringp from) find-file-literally)
+    (unless (or (stringp from)
+               find-file-literally
+               (memq (coding-system-type coding-system) '(0 5)))
       (let ((auto-cs (save-excursion
                       (save-restriction
                         (widen)