Mercurial > emacs
changeset 107554:41aaf2a76894
Fix for `compile' (Bug#5771).
* progmodes/compile.el (compilation-start): Fix regexp detection
of initial cd command (Bug#5771).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 28 Mar 2010 15:51:55 -0400 |
| parents | 04698fd447b3 |
| children | c6807d05a768 |
| files | lisp/ChangeLog lisp/progmodes/compile.el |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Mar 28 15:31:27 2010 -0400 +++ b/lisp/ChangeLog Sun Mar 28 15:51:55 2010 -0400 @@ -1,3 +1,8 @@ +2010-03-28 Chong Yidong <cyd@stupidchicken.com> + + * progmodes/compile.el (compilation-start): Fix regexp detection + of initial cd command (Bug#5771). + 2010-03-28 Stefan Guath <stefan@automata.se> (tiny change) * find-dired.el (find-dired): Use read-directory-name (Bug#5777).
--- a/lisp/progmodes/compile.el Sun Mar 28 15:31:27 2010 -0400 +++ b/lisp/progmodes/compile.el Sun Mar 28 15:51:55 2010 -0400 @@ -1220,7 +1220,8 @@ ;; Then evaluate a cd command if any, but don't perform it yet, else ;; start-command would do it again through the shell: (cd "..") AND ;; sh -c "cd ..; make" - (cd (if (string-match "^\\s *cd\\(?:\\s +\\(\\S +?\\)\\)?\\s *[;&\n]" command) + (cd (if (string-match "\\`\\s *cd\\(?:\\s +\\(\\S +?\\)\\)?\\s *[;&\n]" + command) (if (match-end 1) (substitute-env-vars (match-string 1 command)) "~")