summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2005-04-25 04:30:38 +0000
committerKenichi Handa <handa@m17n.org>2005-04-25 04:30:38 +0000
commit901ae597141d825a65cecb812049a84982682606 (patch)
treed79bc9db437a7537a57a95db1d2c0cdf2a5a0e54
parent0ed4adfc2c66da7f6711ae3f346e27c58288fa59 (diff)
downloademacs-901ae597141d825a65cecb812049a84982682606.tar.gz
(select-safe-coding-system): Don't
check consistency with coding: spec, etc if raw-text or no-conversion was found to be safe.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/international/mule-cmds.el4
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c69788b38d4..8820980bf7d 100644
--- 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 b4f78918ef1..39cb1d05ca3 100644
--- 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)