aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-03-28 15:51:55 -0400
committerChong Yidong2010-03-28 15:51:55 -0400
commitf6f8aa125110ed71a4601c661facfe9150322f0a (patch)
treef7bac9ce3538821547e81b3a1974d0bf5521ad3d
parent7ed287b581c0347bf7abfb5bb4e3bdfd8685c457 (diff)
downloademacs-f6f8aa125110ed71a4601c661facfe9150322f0a.tar.gz
emacs-f6f8aa125110ed71a4601c661facfe9150322f0a.zip
Fix for `compile' (Bug#5771).
* progmodes/compile.el (compilation-start): Fix regexp detection of initial cd command (Bug#5771).
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/compile.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6098c2fc3a1..25dd9c35228 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-03-28 Chong Yidong <cyd@stupidchicken.com>
2
3 * progmodes/compile.el (compilation-start): Fix regexp detection
4 of initial cd command (Bug#5771).
5
12010-03-28 Stefan Guath <stefan@automata.se> (tiny change) 62010-03-28 Stefan Guath <stefan@automata.se> (tiny change)
2 7
3 * find-dired.el (find-dired): Use read-directory-name (Bug#5777). 8 * find-dired.el (find-dired): Use read-directory-name (Bug#5777).
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 20fe89937bc..51e42809153 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1220,7 +1220,8 @@ Returns the compilation buffer created."
1220 ;; Then evaluate a cd command if any, but don't perform it yet, else 1220 ;; Then evaluate a cd command if any, but don't perform it yet, else
1221 ;; start-command would do it again through the shell: (cd "..") AND 1221 ;; start-command would do it again through the shell: (cd "..") AND
1222 ;; sh -c "cd ..; make" 1222 ;; sh -c "cd ..; make"
1223 (cd (if (string-match "^\\s *cd\\(?:\\s +\\(\\S +?\\)\\)?\\s *[;&\n]" command) 1223 (cd (if (string-match "\\`\\s *cd\\(?:\\s +\\(\\S +?\\)\\)?\\s *[;&\n]"
1224 command)
1224 (if (match-end 1) 1225 (if (match-end 1)
1225 (substitute-env-vars (match-string 1 command)) 1226 (substitute-env-vars (match-string 1 command))
1226 "~") 1227 "~")