(set-auto-mode): If -*- spec doesn't set `mode:',

look for other ways of specifying major mode.

diff --git a/lisp/files.el b/lisp/files.el
index 5d9795aedda6f4a12475c23febf320a81b2e57a5..6f85e79e4acff91496145959b41375cf40772ddb 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -991,10 +991,11 @@ If `enable-local-variables' is nil, this function does not check for a
                       (forward-char -1)
                     (goto-char end))
                   (skip-chars-backward " \t")
-                  (funcall (intern (concat (downcase (buffer-substring beg (point))) "-mode"))))
+                  (funcall (intern (concat (downcase (buffer-substring beg (point))) "-mode")))
+                  (setq done t))
               ;; Simple -*-MODE-*- case.
-              (funcall (intern (concat (downcase (buffer-substring beg end)) "-mode"))))
-            (setq done t)))
+              (funcall (intern (concat (downcase (buffer-substring beg end)) "-mode")))
+              (setq done t))))
       ;; If we didn't find a mode from a -*- line, try using the file name.
       (if (and (not done) buffer-file-name)
          (let ((name buffer-file-name)