compile: Support GNU Make-4.0 directory quoting (tiny change)

* lisp/progmodes/compile.el (compilation-directory-matcher)
(compilation-page-delimiter): Support GNU Make-4.0 directory quoting.

Fixes: debbugs:15678

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3a94cf6a69e1ef778263484cad8fafce95cdc23..dd8619768cb72382cdb2ae0e24eb8eded918fa78 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-23  Jed Brown  <jed@59A2.org>  (tiny change)
+
+       * progmodes/compile.el (compilation-directory-matcher)
+       (compilation-page-delimiter):
+       Support GNU Make-4.0 directory quoting.  (Bug#15678)
+
 2013-10-23  Leo Liu  <sdl.web@gmail.com>
 
        * ido.el (ido-tidy): Handle read-only text.

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 3b86ddc1567553f2010f9ab517980466c1717455..54f037285244f7e9ad0b631a3ac53f37d370f02e 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -513,7 +513,7 @@ listed text properties PROP# are given values VAL# as well."
   "Directory to restore to when doing `recompile'.")
 
 (defvar compilation-directory-matcher
-  '("\\(?:Entering\\|Leavin\\(g\\)\\) directory `\\(.+\\)'$" (2 . 1))
+  '("\\(?:Entering\\|Leavin\\(g\\)\\) directory [`']\\(.+\\)'$" (2 . 1))
   "A list for tracking when directories are entered or left.
 If nil, do not track directories, e.g. if all file names are absolute.  The
 first element is the REGEXP matching these messages.  It can match any number
@@ -526,7 +526,7 @@ directory we were in before the last entering message.  If you change this,
 you may also want to change `compilation-page-delimiter'.")
 
 (defvar compilation-page-delimiter
-  "^\\(?:\f\\|.*\\(?:Entering\\|Leaving\\) directory `.+'\n\\)+"
+  "^\\(?:\f\\|.*\\(?:Entering\\|Leaving\\) directory [`'].+'\n\\)+"
   "Value of `page-delimiter' in Compilation mode.")
 
 (defvar compilation-mode-font-lock-keywords