aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2011-05-22 14:19:24 -0300
committerStefan Monnier2011-05-22 14:19:24 -0300
commit79106a44d30dd3ec15a5bdd653b1d1911fe05ff7 (patch)
treeb1d8240053e1f90fb0ad45333b87049d381a47c5
parent162d78a17e0da16bdcb0c2d5633f8fdaf323f407 (diff)
downloademacs-79106a44d30dd3ec15a5bdd653b1d1911fe05ff7.tar.gz
emacs-79106a44d30dd3ec15a5bdd653b1d1911fe05ff7.zip
* lisp/progmodes/grep.el (grep-mode): Fix it for good!
Fixes: debbugs:8684
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/progmodes/grep.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 91c51b7925d..a759eb749ef 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-05-22 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * progmodes/grep.el (grep-mode): Fix it for good (bug#8684)!
4
12011-05-22 Glenn Morris <rgm@gnu.org> 52011-05-22 Glenn Morris <rgm@gnu.org>
2 6
3 * files.el (hack-local-variables-prop-line): Small simplifications. 7 * files.el (hack-local-variables-prop-line): Small simplifications.
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 04b54b1d662..db8e82193b3 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -700,7 +700,7 @@ This function is called from `compilation-filter-hook'."
700 grep-regexp-alist) 700 grep-regexp-alist)
701 ;; compilation-directory-matcher can't be nil, so we set it to a regexp that 701 ;; compilation-directory-matcher can't be nil, so we set it to a regexp that
702 ;; can never match. 702 ;; can never match.
703 (set (make-local-variable 'compilation-directory-matcher) "\\`a\\`") 703 (set (make-local-variable 'compilation-directory-matcher) '("\\`a\\`"))
704 (set (make-local-variable 'compilation-process-setup-function) 704 (set (make-local-variable 'compilation-process-setup-function)
705 'grep-process-setup) 705 'grep-process-setup)
706 (set (make-local-variable 'compilation-disable-input) t) 706 (set (make-local-variable 'compilation-disable-input) t)