aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2005-04-26 05:51:19 +0000
committerKenichi Handa2005-04-26 05:51:19 +0000
commitbc10bcbd5d4d12a67ba4d868c588b49db4ea90fa (patch)
tree24f8af7bf15301036d418ae1d7214f6fb3cb7504
parent38f60cd97f1a78a538b06d3599b68bc61d90ffa2 (diff)
downloademacs-bc10bcbd5d4d12a67ba4d868c588b49db4ea90fa.tar.gz
emacs-bc10bcbd5d4d12a67ba4d868c588b49db4ea90fa.zip
(select-safe-coding-system): Fix
previous change.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/international/mule-cmds.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f45d3dba17f..bd04dfb19fc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12005-04-26 Kenichi Handa <handa@m17n.org>
2
3 * international/mule-cmds.el (select-safe-coding-system): Fix
4 previous change.
5
12005-04-26 Lute Kamstra <lute@gnu.org> 62005-04-26 Lute Kamstra <lute@gnu.org>
2 7
3 * calc/calc.el (calc-trail-mode): Don't set font-lock-defaults. 8 * calc/calc.el (calc-trail-mode): Don't set font-lock-defaults.
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 39cb1d05ca3..bc656113428 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -929,7 +929,8 @@ and TO is ignored."
929 ;; by using `find-file-literally'. 929 ;; by using `find-file-literally'.
930 (unless (or (stringp from) 930 (unless (or (stringp from)
931 find-file-literally 931 find-file-literally
932 (memq (coding-system-type coding-system) '(0 5))) 932 (and coding-system
933 (memq (coding-system-type coding-system) '(0 5))))
933 (let ((auto-cs (save-excursion 934 (let ((auto-cs (save-excursion
934 (save-restriction 935 (save-restriction
935 (widen) 936 (widen)