(set-auto-mode): Call `throw' correctly.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83a01bdd2edde92704ebf0d254f03866ad0062a5..aa83b78af1eb1ef5cc4ff57469f47b79073d7d61 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-28  John Paul Wallington  <jpw@gnu.org>
+
+       * files.el (set-auto-mode): Call `throw' correctly.
+
 2004-10-28  Juri Linkov  <juri@jurta.org>
 
        * info.el (Info-file-list-for-emacs): Add ("Info" . "info")

diff --git a/lisp/files.el b/lisp/files.el
index 83955d26fccc6bb337f5c51a6cf954e7765eeed7..a4f846fbdee81dcbff64b39973b45dead7c2fbc3 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1896,7 +1896,7 @@ only set the major mode, if that would change it."
                (message "Ignoring unknown mode `%s'" mode)
              (setq done t)
              (or (set-auto-mode-0 mode)
-                 (throw 'nop)))))
+                 (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
       ;; finds the interpreter anywhere in $PATH.