diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 70874a9c2fb..22f561f8ef8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-01-09 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * progmodes/compile.el: Don't treat compile-command as safe if | ||
| 4 | compilation-read-command might be nil (Bug#4218). | ||
| 5 | |||
| 1 | 2010-01-09 Jan Djärv <jan.h.d@swipnet.se> | 6 | 2010-01-09 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * startup.el (command-line-1): Use orig-argi to check for ignored X and | 8 | * 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 cb2b8986f22..6b2b30edb96 100644 --- 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: | |||
| 603 | (file-name-sans-extension buffer-file-name))))))" | 603 | (file-name-sans-extension buffer-file-name))))))" |
| 604 | :type 'string | 604 | :type 'string |
| 605 | :group 'compilation) | 605 | :group 'compilation) |
| 606 | ;;;###autoload(put 'compile-command 'safe-local-variable 'stringp) | 606 | ;;;###autoload(put 'compile-command 'safe-local-variable (lambda (a) (and (stringp a) (or (not (boundp 'compilation-read-command)) compilation-read-command)))) |
| 607 | 607 | ||
| 608 | ;;;###autoload | 608 | ;;;###autoload |
| 609 | (defcustom compilation-disable-input nil | 609 | (defcustom compilation-disable-input nil |