* files.el (hack-one-local-variable): If the mode function is for

a minor mode, pass it an argument (Bug#4148).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 24e5fa9eae38083a76aec53c1a7b970323580f95..814370a65705ba8780d341f245ccc030a417e429 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-17  Chong Yidong  <cyd@stupidchicken.com>
+
+       * files.el (hack-one-local-variable): If the mode function is for
+       a minor mode, pass it an argument (Bug#4148).
+
 2009-08-17  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-register-completion-file-name-handler):

diff --git a/lisp/files.el b/lisp/files.el
index 6f8ff69caef6fef581128eb86b408ab262fa41ef..825ff250449b4455a92227ae67c6f7db99733b94 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3191,7 +3191,12 @@ already the major mode."
                                     "-mode"))))
           (unless (eq (indirect-function mode)
                       (indirect-function major-mode))
-            (funcall mode))))
+            (if (memq mode minor-mode-list)
+                ;; A minor mode must be passed an argument.
+                ;; Otherwise, if the user enables the minor mode in a
+                ;; major mode hook, this would toggle it off.
+                (funcall mode 1)
+              (funcall mode)))))
        ((eq var 'eval)
         (save-excursion (eval val)))
        (t