(set-auto-coding): Don't search for

"unibyte:" or "coding:" if set-auto-mode-1 returns nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 70e5fa8..2e29f84 100644 (file)
--- 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\e,Bm\e(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 f8468f9..124761c 100644 (file)
--- 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