[Emacs-diffs] /srv/bzr/emacs/trunk r99760: Fix for `compile' (Bug#5771).

[Chong Yidong]

------------------------------------------------------------
revno: 99760
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2010-03-28 15:51:55 -0400
message:
  Fix for `compile' (Bug#5771).
  
  * progmodes/compile.el (compilation-start): Fix regexp detection
  of initial cd command (Bug#5771).
modified:
  lisp/ChangeLog
  lisp/progmodes/compile.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-03-28 19:31:27 +0000
+++ b/lisp/ChangeLog    2010-03-28 19:51:55 +0000
@@ -1,3 +1,8 @@
+2010-03-28  Chong Yidong  <address@hidden>
+
+       * progmodes/compile.el (compilation-start): Fix regexp detection
+       of initial cd command (Bug#5771).
+
 2010-03-28  Stefan Guath  <address@hidden>  (tiny change)
 
        * find-dired.el (find-dired): Use read-directory-name (Bug#5777).

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2010-03-24 13:41:07 +0000
+++ b/lisp/progmodes/compile.el 2010-03-28 19:51:55 +0000
@@ -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))
                  "~")