diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/grep.el | 2 |
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 @@ | |||
| 1 | 2011-05-22 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * progmodes/grep.el (grep-mode): Fix it for good (bug#8684)! | ||
| 4 | |||
| 1 | 2011-05-22 Glenn Morris <rgm@gnu.org> | 5 | 2011-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) |