Remove duplicate binding

[gnu-emacs] / etc / grep.txt

diff --git a/etc/grep.txt b/etc/grep.txt
index 564893d5b3e077f3b97dc8c8dffb349d33f22c57..3861a7f0448e7ae5078237c019dcdca49afff404 100644 (file)
--- a/etc/grep.txt
+++ b/etc/grep.txt
@@ -39,7 +39,7 @@ grep -nH --color=always -e "INFO tree" ../info/*
 
 * GNU grep 2.5.1 on lines starting with a number and colon
 
-grep -nH -e "Universal Time" ../lispref/*
+grep -nH --color=always -e "Universal Time" ../doc/lispref/*
 ../lispref/os.texi:1010:0:00 January 1, 1970 UTC (Coordinated \e[01;31mUniversal Time\e[00m)
 
 * GNU grep 2.5.1 with context lines
@@ -72,13 +72,18 @@ Grep finished (matches found) at Thu Jul 21 15:02:15
 agrep -n "INFO tree" ../info/*
 ../info/dir: 6: File: dir      Node: Top       This is the top of the INFO tree
 
+* bzr grep with Bazaar plugin [grep]
+
+bzr grep --color=always -in "org-element-map"
+\e[35mlisp/org/org.el\e[1;36m:\e[0m21047\e[1;36m:\e[0m                    (\e[1;31morg-element-map\e[0m
+
 * git-grep
-  with `[diff "el"] xfuncname = "^(\\(.*)$"' in .gitconfig
-  and `*.el diff=el' in .gitattributes
+  with '[diff "lisp"] xfuncname = "^(\\(.*)$"' in .gitconfig
+  and '*.el diff=lisp' in .gitattributes
 
-git grep -inH -p -e "org-element-map"
-lisp/org/org.el=20969=(defun org-fill-paragraph (&optional justify)
-lisp/org/org.el:21047:               (org-element-map
+git --no-pager grep -inH -p -e "org-element-map"
+lisp/org/org.el\e[36m=\e[m20969\e[36m=\e[m(defun org-fill-paragraph (&optional justify)
+lisp/org/org.el\e[36m:\e[m21047\e[36m:\e[m               (\e[1;31morg-element-map\e[m
 
 * unknown greps
 
@@ -92,7 +97,7 @@ grep -nH -e "xyzxyz" ../info/*
 
 \f
 
-Copyright (C) 2005-2014 Free Software Foundation, Inc.
+Copyright (C) 2005-2016 Free Software Foundation, Inc.
 
 COPYING PERMISSIONS: