Merge from trunk.

2 files changed, 6 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 24c0fd54422..0749862f676 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-05  Juri Linkov  <juri@jurta.org>
+
+        * grep.txt: Add `eval' to the Local Variables section that
+        emulates `grep-filter'.
+
 2011-08-30  Paul Eggert  <eggert@cs.ucla.edu>
 
         * MACHINES: Remove obsolete info and update a bit (Bug#9404).
diff --git a/etc/grep.txt b/etc/grep.txt
index 9a3159f6b08..01ffa9f3ef8 100644
--- a/etc/grep.txt
+++ b/etc/grep.txt
@@ -103,5 +103,6 @@ COPYING PERMISSIONS:
 
 
 ;;; Local Variables:
+;;; eval: (let ((inhibit-read-only t) (compilation-filter-start (point-min))) (save-excursion (goto-char (point-max)) (grep-filter) (set-buffer-modified-p nil)))
 ;;; buffer-read-only: t
 ;;; End: