Mercurial > emacs
changeset 106777:e96c7312f94c
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).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 09 Jan 2010 15:53:55 -0500 |
| parents | 7a2c06c2f19c |
| children | 95040dd9104b |
| files | lisp/ChangeLog lisp/progmodes/compile.el |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Jan 09 15:31:26 2010 -0500 +++ b/lisp/ChangeLog Sat Jan 09 15:53:55 2010 -0500 @@ -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
--- a/lisp/progmodes/compile.el Sat Jan 09 15:31:26 2010 -0500 +++ b/lisp/progmodes/compile.el Sat Jan 09 15:53:55 2010 -0500 @@ -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