(set-auto-coding): Use set-auto-mode-1.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd7496b855fe6a5a4c5d29bef87f8f07a1f0b066..1821419e66660182c3116bce27b2b6c8f7cf3b75 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2001-12-11  Richard M. Stallman  <rms@gnu.org>
+
+       * international/mule.el (set-auto-coding): Use set-auto-mode-1.
+
+       * files.el (set-auto-mode-1): New subroutine, broken out of
+       set-auto-mode.
+       (set-auto-mode, hack-local-variables-prop-line): Use that.
+
 2001-12-11  Dave Love  <fx@gnu.org>
 
        * language/thai-util.el, language/thai.el: Add Unicode
@@ -14,6 +22,8 @@
 
 2001-12-11  Richard M. Stallman  <rms@gnu.org>
 
+       * emacs-lisp/authors.el (authors-aliases): Delete "Richard Stallmao".
+
        * textmodes/ispell.el (ispell-buffer-local-parsing):
        Match xml like sgml.
 

diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 9ffc9dc54e7f7589a024a8b9fb0f9b7e902869a2..a39e2145d82c8718a9aecaa00cbbdbb59950e56b 100644 (file)
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1386,26 +1386,18 @@ function by default."
        ;; At first check the head.
        (when head-found
          (goto-char head-start)
-         (setq pos (re-search-forward "[\n\r]" head-end t))
-         (if (and pos
-                  (= (char-after head-start) ?#)
-                  (= (char-after (1+ head-start)) ?!))
-             ;; If the file begins with "#!" (exec interpreter magic),
-             ;; look for coding frobs in the first two lines.  You cannot
-             ;; necessarily put them in the first line of such a file
-             ;; without screwing up the interpreter invocation.
-             (setq pos (search-forward "\n" head-end t)))
-         (if pos (setq head-end pos))
+         (setq head-end (set-auto-mode-1))
+         (setq head-start (point))
          (when (< head-found head-end)
            (goto-char head-start)
            (when (and set-auto-coding-for-load
                       (re-search-forward
-                       "-\\*-\\(.*;\\)?[ \t]*unibyte:[ \t]*\\([^ ;]+\\)"
+                       "\\(.*;\\)?[ \t]*unibyte:[ \t]*\\([^ ;]+\\)"
                        head-end t))
              (setq coding-system 'raw-text))
            (when (and (not coding-system)
                       (re-search-forward
-                       "-\\*-\\(.*;\\)?[ \t]*coding:[ \t]*\\([^ ;]+\\)"
+                       "\\(.*;\\)?[ \t]*coding:[ \t]*\\([^ ;]+\\)"
                        head-end t))
              (setq coding-system (intern (match-string 2)))
              (or (coding-system-p coding-system)