summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/international/mule.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 70e5fa83c4d..2e29f8405d1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-13 Eli Zaretskii <eliz@is.elta.co.il>
+
+ * international/mule.el (set-auto-coding): Don't search for
+ "unibyte:" or "coding:" if set-auto-mode-1 returns nil.
+
2001-12-13 Pavel Jan,Bm(Bk <Pavel@Janik.cz>
* mail/mailabbrev.el (mail-abbrevs-setup): Do not use make-local-hook.
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index f8468f999c8..124761c0d2a 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1388,7 +1388,7 @@ function by default."
(goto-char head-start)
(setq head-end (set-auto-mode-1))
(setq head-start (point))
- (when (< head-found head-end)
+ (when (and head-end (< head-found head-end))
(goto-char head-start)
(when (and set-auto-coding-for-load
(re-search-forward