Skip to content

Commit

Permalink
compile: Support GNU Make-4.0 directory quoting (tiny change)
Browse files Browse the repository at this point in the history
* lisp/progmodes/compile.el (compilation-directory-matcher)
(compilation-page-delimiter): Support GNU Make-4.0 directory quoting.

Fixes: debbugs:15678
  • Loading branch information
jedbrown authored and rgmorris committed Oct 23, 2013
1 parent 66b238d commit f493ff1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 6 additions & 0 deletions lisp/ChangeLog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions lisp/progmodes/compile.el
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit f493ff1

Please sign in to comment.