aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJed Brown2013-10-23 09:25:56 -0700
committerGlenn Morris2013-10-23 09:25:56 -0700
commitf493ff19e981bad0ab8146c41fa65945de977088 (patch)
tree19ae9afa533d67905106852674b2f1333812459d
parent66b238dff6ec9c82d20c77c284623f6f15c73388 (diff)
downloademacs-f493ff19e981bad0ab8146c41fa65945de977088.tar.gz
emacs-f493ff19e981bad0ab8146c41fa65945de977088.zip
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
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/compile.el4
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3a94cf6a69..dd8619768cb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12013-10-23 Jed Brown <jed@59A2.org> (tiny change)
2
3 * progmodes/compile.el (compilation-directory-matcher)
4 (compilation-page-delimiter):
5 Support GNU Make-4.0 directory quoting. (Bug#15678)
6
12013-10-23 Leo Liu <sdl.web@gmail.com> 72013-10-23 Leo Liu <sdl.web@gmail.com>
2 8
3 * ido.el (ido-tidy): Handle read-only text. 9 * ido.el (ido-tidy): Handle read-only text.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 3b86ddc1567..54f03728524 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -513,7 +513,7 @@ listed text properties PROP# are given values VAL# as well."
513 "Directory to restore to when doing `recompile'.") 513 "Directory to restore to when doing `recompile'.")
514 514
515(defvar compilation-directory-matcher 515(defvar compilation-directory-matcher
516 '("\\(?:Entering\\|Leavin\\(g\\)\\) directory `\\(.+\\)'$" (2 . 1)) 516 '("\\(?:Entering\\|Leavin\\(g\\)\\) directory [`']\\(.+\\)'$" (2 . 1))
517 "A list for tracking when directories are entered or left. 517 "A list for tracking when directories are entered or left.
518If nil, do not track directories, e.g. if all file names are absolute. The 518If nil, do not track directories, e.g. if all file names are absolute. The
519first element is the REGEXP matching these messages. It can match any number 519first 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,
526you may also want to change `compilation-page-delimiter'.") 526you may also want to change `compilation-page-delimiter'.")
527 527
528(defvar compilation-page-delimiter 528(defvar compilation-page-delimiter
529 "^\\(?:\f\\|.*\\(?:Entering\\|Leaving\\) directory `.+'\n\\)+" 529 "^\\(?:\f\\|.*\\(?:Entering\\|Leaving\\) directory [`'].+'\n\\)+"
530 "Value of `page-delimiter' in Compilation mode.") 530 "Value of `page-delimiter' in Compilation mode.")
531 531
532(defvar compilation-mode-font-lock-keywords 532(defvar compilation-mode-font-lock-keywords