[Emacs-diffs] /srv/bzr/emacs/trunk r99283: Fix compile-command's safe-local-variable condition.

[Chong Yidong]

------------------------------------------------------------
revno: 99283
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-01-09 15:53:55 -0500
message:
  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).
modified:
  lisp/ChangeLog
  lisp/progmodes/compile.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-09 12:31:29 +0000
+++ b/lisp/ChangeLog    2010-01-09 20:53:55 +0000
@@ -1,3 +1,8 @@
+2010-01-09  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * startup.el (command-line-1): Use orig-argi to check for ignored X and

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2010-01-04 05:35:18 +0000
+++ b/lisp/progmodes/compile.el 2010-01-09 20:53:55 +0000
@@ -603,7 +603,7 @@
                        (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