[Emacs-diffs] Changes to emacs/lisp/files.el

[Daniel Pfeiffer]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.721 emacs/lisp/files.el:1.722
*** emacs/lisp/files.el:1.721   Thu Nov  4 10:04:16 2004
--- emacs/lisp/files.el Thu Nov  4 20:25:08 2004
***************
*** 1912,1917 ****
--- 1912,1918 ----
                (message "Ignoring unknown mode `%s'" mode)
              (setq done t)
              (or (set-auto-mode-0 mode keep-mode-if-same)
+                 ;; continuing would call minor modes again, toggling them off
                  (throw 'nop nil)))))
        ;; If we didn't, look for an interpreter specified in the first line.
        ;; As a special case, allow for things like "#!/bin/env perl", which
***************
*** 1924,1933 ****
            ;; Map interpreter name to a mode, signalling we're done at the
            ;; same time.
            done (assoc (file-name-nondirectory mode)
!                       interpreter-mode-alist)))
      ;; If we found an interpreter mode to use, invoke it now.
!     (if done
!       (set-auto-mode-0 (cdr done) keep-mode-if-same)
        (if (setq done (save-excursion
                       (goto-char (point-min))
                       (assoc-default nil magic-mode-alist
--- 1925,1935 ----
            ;; Map interpreter name to a mode, signalling we're done at the
            ;; same time.
            done (assoc (file-name-nondirectory mode)
!                       interpreter-mode-alist))
!       (if done
!         (set-auto-mode-0 (cdr done) keep-mode-if-same)))
      ;; If we found an interpreter mode to use, invoke it now.
!     (unless done
        (if (setq done (save-excursion
                       (goto-char (point-min))
                       (assoc-default nil magic-mode-alist