Fix compile-command's safe-local-variable condition.

* progmodes/compile.el: Don't treat compile-command as safe if
compilation-read-command might be nil (Bug#4218).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 70874a9c2fbf7142deb27d14506d40541eef83d6..22f561f8ef8279a57acfcebbd6229b3c0bf03ebb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-09  Chong Yidong  <cyd@stupidchicken.com>
+
+       * progmodes/compile.el: Don't treat compile-command as safe if
+       compilation-read-command might be nil (Bug#4218).
+
 2010-01-09  Jan Djärv  <jan.h.d@swipnet.se>
 
        * startup.el (command-line-1): Use orig-argi to check for ignored X and

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index cb2b8986f22332371030dda697c025bfe3c2083a..6b2b30edb966d23e3e92989c772f293b2e2c2327 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -603,7 +603,7 @@ You might also use mode hooks to specify it in certain modes, like this:
                        (file-name-sans-extension buffer-file-name))))))"
   :type 'string
   :group 'compilation)
-;;;###autoload(put 'compile-command 'safe-local-variable 'stringp)
+;;;###autoload(put 'compile-command 'safe-local-variable (lambda (a) (and (stringp a) (or (not (boundp 'compilation-read-command)) compilation-read-command))))
 
 ;;;###autoload
 (defcustom compilation-disable-input nil