Fix various uses of display-buffer and pop-to-buffer

[bpt/emacs.git] / etc / grep.txt

diff --git a/etc/grep.txt b/etc/grep.txt
index 4149f80..01ffa9f 100644 (file)
--- a/etc/grep.txt
+++ b/etc/grep.txt
@@ -1,4 +1,4 @@
-* Introduction  -*-grep-*-
+* Introduction  -*-grep-*-     (See the end of file for copyright information)
 
 This shows the different kinds of messages grep recognizes by default and
 how they are rendered.  It is intended both to help you decide which matchers
@@ -19,11 +19,19 @@ grep -nH -e "INFO tree" ../info/*
 grep -nH --color=always -e "INFO tree" ../info/*
 ../info/dir:6:File: dir        Node: Top       This is the top of the \e[01;31mINFO tree\e[00m
 
-* GNU grep 2.5.1-cvs with specified minimal colors
+* GNU grep 2.5.1-cvs with the specified matching color
 
 GREP_COLORS='mt=01;31:fn=:ln=:bn=:se=:ml=:cx=:ne' grep -nH --color=always -e "INFO tree" ../info/*
 ../info/dir:6:File: dir        Node: Top       This is the top of the \e[01;31mINFO tree\e[m
 
+* GNU grep 2.5.1-cvs with colors for the file name, line number and match
+
+GREP_COLORS='mt=01;31:fn=35:ln=32:bn=:se=:ml=36:cx=37:ne' grep -nH --color=always -e "INFO tree" ../info/*
+\e[35m../info/dir\e[m:\e[32m6\e[m:\e[36mFile: dir   Node: Top       This is the top of the \e[01;31mINFO tree\e[m
+\e[35m1\e[m:\e[32m2\e[m:\e[36m3:4:\e[01;31mtext\e[m
+\e[35m1:2\e[m:\e[32m3\e[m:\e[36m4:\e[01;31mtext\e[m
+\e[35m1:2:3\e[m:\e[32m4\e[m:\e[36m\e[01;31mtext\e[m
+
 * GNU grep 2.5.1-cvs with default colors
 
 grep -nH --color=always -e "INFO tree" ../info/*
@@ -50,10 +58,14 @@ Binary file 2005-06 matches
 
 * GNU grep 2.5.1: other messages
 
+Grep started at Tue Jul 19 15:41:30
 grep: ../info/dirinfo: No such file or directory
-Grep exited abnormally with code 2 at Tue Jul 19 15:42:32
+Grep interrupt at Tue Jul 19 15:42:31
+Grep killed at Tue Jul 19 15:42:31
+Grep terminated at Tue Jul 19 15:42:31
+Grep exited abnormally with code 2 at Tue Jul 19 15:42:31
 Grep finished with no matches found at Tue Jul 19 15:43:12
-Grep finished (matches found) at Tue Jul 19 15:45:15
+Grep finished (matches found) at Thu Jul 21 15:02:15
 
 * agrep
 
@@ -70,6 +82,27 @@ grep -nH -e "xyzxyz" ../info/*
 ../info/emacs-2 1205.10-1205.15 inserts `xyzxyzxyzxyz' in the current buffer.
 ../info/emacs-2 1205 inserts `xyzxyzxyzxyz' in the current buffer.
 
+\f
+
+Copyright (C) 2005-2011  Free Software Foundation, Inc.
+
+COPYING PERMISSIONS:
+
+    This document is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
 ;;; 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: