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

[Daniel Pfeiffer]

Index: emacs/lisp/files.el
diff -c emacs/lisp/files.el:1.712 emacs/lisp/files.el:1.713
*** emacs/lisp/files.el:1.712   Tue Oct 26 21:41:17 2004
--- emacs/lisp/files.el Wed Oct 27 10:27:46 2004
***************
*** 1913,1929 ****
        (let ((name buffer-file-name))
          ;; Remove backup-suffixes from file name.
          (setq name (file-name-sans-versions name))
!         (while (not done)
            ;; Find first matching alist entry.
            (let ((case-fold-search
                   (memq system-type '(vax-vms windows-nt cygwin))))
              (if (and (setq mode (assoc-default name auto-mode-alist
                                                 'string-match))
                       (consp mode)
                       (cadr mode))
                  (setq mode (car mode)
                        name (substring name 0 (match-beginning 0)))
!               (setq done t)))
            (if mode
                ;; When JUST-FROM-FILE-NAME is set, we are working on behalf
                ;; of set-visited-file-name.  In that case, if the major mode
--- 1913,1930 ----
        (let ((name buffer-file-name))
          ;; Remove backup-suffixes from file name.
          (setq name (file-name-sans-versions name))
!         (while name
            ;; Find first matching alist entry.
            (let ((case-fold-search
                   (memq system-type '(vax-vms windows-nt cygwin))))
              (if (and (setq mode (assoc-default name auto-mode-alist
                                                 'string-match))
+                      (setq done t)
                       (consp mode)
                       (cadr mode))
                  (setq mode (car mode)
                        name (substring name 0 (match-beginning 0)))
!               (setq name)))
            (if mode
                ;; When JUST-FROM-FILE-NAME is set, we are working on behalf
                ;; of set-visited-file-name.  In that case, if the major mode