summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-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 @@
+2005-04-26 Kenichi Handa <handa@m17n.org>
+
+ * international/mule-cmds.el (select-safe-coding-system): Fix
+ previous change.
+
2005-04-26 Lute Kamstra <lute@gnu.org>
* 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."
;; by using `find-file-literally'.
(unless (or (stringp from)
find-file-literally
- (memq (coding-system-type coding-system) '(0 5)))
+ (and coding-system
+ (memq (coding-system-type coding-system) '(0 5))))
(let ((auto-cs (save-excursion
(save-restriction
(widen)