* lisp/progmodes/grep.el (grep-mode): Disable default

compilation-directory-matcher setting.

Fixes: debbugs:8684

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 79427663988fd2fec53c506ca7ea9122e225677d..1fc7cc88f8d892db650b609eb47faa263becc781 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/grep.el (grep-mode): Disable default
+       compilation-directory-matcher setting (bug#8684).
+
 2011-05-17  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-handle-insert-file-contents): Use "dd"

diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 143220ad28af89c79824fb8010e63644bf304fd2..3b819a149b2958a2d66147f6b46b185a0dfac8fc 100644 (file)
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -698,6 +698,7 @@ This function is called from `compilation-filter-hook'."
        grep-hit-face)
   (set (make-local-variable 'compilation-error-regexp-alist)
        grep-regexp-alist)
+  (set (make-local-variable 'compilation-directory-matcher) nil)
   (set (make-local-variable 'compilation-process-setup-function)
        'grep-process-setup)
   (set (make-local-variable 'compilation-disable-input) t)