Deprecate using "mode:" to enable minor modes (bug#8613)

* lisp/files.el (hack-one-local-variable-eval-safep):
Consider "eval: (foo-mode)" to be safe.

* doc/emacs/custom.texi (Specifying File Variables):
Deprecate using mode: for minor modes.

* etc/NEWS: Mention this.

* lisp/doc-view.el, lisp/net/soap-client.el:
Change "mode:" minor-mode file local variables to use "eval:".

4 files changed, 27 insertions, 17 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cbb03baa3bf..50c3022ba0a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,10 @@
 2011-05-10  Glenn Morris  <rgm@gnu.org>
+           Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * files.el (hack-one-local-variable-eval-safep):
+        Consider "eval: (foo-mode)" to be safe.  (Bug#8613)
+
+2011-05-10  Glenn Morris  <rgm@gnu.org>
 
         * calendar/diary-lib.el (diary-list-entries-hook)
         (diary-mark-entries-hook, diary-nongregorian-listing-hook)
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index ab0d6bf837b..7bd1a55011e 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -1549,7 +1549,7 @@ See the command `doc-view-mode' for more information on this mode."
 (provide 'doc-view)
 
 ;; Local Variables:
-;; mode: outline-minor
+;; eval: (outline-minor-mode)
 ;; End:
 
 ;;; doc-view.el ends here
diff --git a/lisp/files.el b/lisp/files.el
index 72cfc89ef8c..336a0a436f9 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3327,21 +3327,25 @@ It is dangerous if either of these conditions are met:
       ;; Certain functions can be allowed with safe arguments
       ;; or can specify verification functions to try.
       (and (symbolp (car exp))
-           (let ((prop (get (car exp) 'safe-local-eval-function)))
-             (cond ((eq prop t)
-                    (let ((ok t))
-                      (dolist (arg (cdr exp))
-                        (unless (hack-one-local-variable-constantp arg)
-                          (setq ok nil)))
-                      ok))
-                   ((functionp prop)
-                    (funcall prop exp))
-                   ((listp prop)
-                    (let ((ok nil))
-                      (dolist (function prop)
-                        (if (funcall function exp)
-                            (setq ok t)))
-                      ok)))))))
+           ;; Allow (minor)-modes calls with no arguments.
+           ;; This obsoletes the use of "mode:" for such things.  (Bug#8613)
+           (or (and (null (cdr exp))
+                    (string-match "-mode\\'" (symbol-name (car exp))))
+               (let ((prop (get (car exp) 'safe-local-eval-function)))
+                 (cond ((eq prop t)
+                        (let ((ok t))
+                          (dolist (arg (cdr exp))
+                            (unless (hack-one-local-variable-constantp arg)
+                              (setq ok nil)))
+                          ok))
+                       ((functionp prop)
+                        (funcall prop exp))
+                       ((listp prop)
+                        (let ((ok nil))
+                          (dolist (function prop)
+                            (if (funcall function exp)
+                                (setq ok t)))
+                          ok))))))))
 
 (defun hack-one-local-variable (var val)
   "Set local variable VAR with value VAL.
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index b5453733d1d..9862332bf3f 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -1745,7 +1745,7 @@ operations in a WSDL document."
 
 
 ;;; Local Variables:
-;;; mode: outline-minor
+;;; eval: (outline-minor-mode)
 ;;; outline-regexp: ";;;;+"
 ;;; End: