aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/files.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83a01bdd2e..aa83b78af1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-28 John Paul Wallington <[email protected]>
+
+ * files.el (set-auto-mode): Call `throw' correctly.
+
2004-10-28 Juri Linkov <[email protected]>
* info.el (Info-file-list-for-emacs): Add ("Info" . "info")
diff --git a/lisp/files.el b/lisp/files.el
index 83955d26fc..a4f846fbde 100644
--- 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.