eshell: Add 'rgrep' builtin

* lisp/eshell/em-unix.el (eshell/rgrep): New function.
(eshell-unix-initialize): Add "rgrep" to 'eshell-complex-commands'.

* etc/NEWS: Add NEWS entry for rgrep.

* doc/misc/eshell.texi (Built-ins): Add documentation for rgrep.

diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 1c33c04f647596b0d1875476312009b378fed866..4e2bddf42af9c54969986b4aca8df7000545f19d 100644 (file)
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -602,6 +602,8 @@ disabled by default.
 @cmindex egrep
 @itemx fgrep
 @cmindex fgrep
+@itemx rgrep
+@cmindex rgrep
 @itemx glimpse
 @cmindex glimpse
 The @command{grep} commands are compatible with GNU @command{grep},

diff --git a/etc/NEWS b/etc/NEWS
index c61a9ec3c5f63a00620d9455f167fcb21fa9b216..5e1fd76e99e2eb7ca7c9a23ca9a55629fe01290b 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -174,6 +174,11 @@ correctly unloads Eshell and all of its modules.
 After manually editing 'eshell-aliases-file', you can use this command
 to load the edited aliases.
 
++++
+*** 'rgrep' is now a builtin command.
+Running "rgrep" in Eshell now uses the Emacs grep facility instead of
+calling external rgrep.
+
 ** Shell Mode
 
 +++

diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index d550910f4f005720022ec260a016905fc4124042..a792493e071280c76d9da1c9498b286e47e47fce 100644 (file)
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -145,9 +145,10 @@ Otherwise, Emacs will attempt to use rsh to invoke du on the remote machine."
     (add-hook 'pcomplete-try-first-hook
              'eshell-complete-host-reference nil t))
   (setq-local eshell-complex-commands
-       (append '("grep" "egrep" "fgrep" "agrep" "glimpse" "locate"
-                 "cat" "time" "cp" "mv" "make" "du" "diff")
-               eshell-complex-commands)))
+             (append '("grep" "egrep" "fgrep" "agrep" "rgrep"
+                        "glimpse" "locate" "cat" "time" "cp" "mv"
+                        "make" "du" "diff")
+                     eshell-complex-commands)))
 
 (defalias 'eshell/date     'current-time-string)
 (defalias 'eshell/basename 'file-name-nondirectory)
@@ -773,6 +774,10 @@ external command."
   "Use Emacs grep facility instead of calling external agrep."
   (eshell-grep "agrep" args))
 
+(defun eshell/rgrep (&rest args)
+  "Use Emacs grep facility instead of calling external rgrep."
+  (eshell-grep "grep" (append '("-rH") args) t))
+
 (defun eshell/glimpse (&rest args)
   "Use Emacs grep facility instead of calling external glimpse."
   (let (null-device)