[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107850: * lisp/progmodes/grep.el (grep, rgrep): Doc fix.

[Chong Yidong]

------------------------------------------------------------
revno: 107850
fixes bug(s): http://debbugs.gnu.org/11268
committer: Chong Yidong <address@hidden>
branch nick: emacs-24
timestamp: Wed 2012-04-18 14:04:51 +0800
message:
  * lisp/progmodes/grep.el (grep, rgrep): Doc fix.
modified:
  lisp/ChangeLog
  lisp/progmodes/grep.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-04-18 03:48:43 +0000
+++ b/lisp/ChangeLog    2012-04-18 06:04:51 +0000
@@ -1,3 +1,7 @@
+2012-04-18  Chong Yidong  <address@hidden>
+
+       * progmodes/grep.el (grep, rgrep): Doc fix (Bug#11268).
+
 2012-04-18  Glenn Morris  <address@hidden>
 
        * net/network-stream.el (open-network-stream): Doc fix.

=== modified file 'lisp/progmodes/grep.el'
--- a/lisp/progmodes/grep.el    2012-01-25 02:01:22 +0000
+++ b/lisp/progmodes/grep.el    2012-04-18 06:04:51 +0000
@@ -728,9 +728,9 @@
 (defun grep (command-args)
   "Run grep, with user-specified args, and collect output in a buffer.
 While grep runs asynchronously, you can use \\[next-error] (M-x next-error),
-or \\<grep-mode-map>\\[compile-goto-error] in the grep \
-output buffer, to go to the lines where grep
-found matches.
+or \\<grep-mode-map>\\[compile-goto-error] in the *grep* \
+buffer, to go to the lines where grep found
+matches.  To kill the grep job before it finishes, type \\[kill-compilation].
 
 For doing a recursive `grep', see the `rgrep' command.  For running
 `grep' in a specific directory, see `lgrep'.
@@ -957,10 +957,11 @@
 before it is executed.
 With two \\[universal-argument] prefixes, directly edit and run 
`grep-find-command'.
 
-Collect output in a buffer.  While find runs asynchronously, you
-can use \\[next-error] (M-x next-error), or 
\\<grep-mode-map>\\[compile-goto-error] \
+Collect output in a buffer.  While the recursive grep is running,
+you can use \\[next-error] (M-x next-error), or 
\\<grep-mode-map>\\[compile-goto-error] \
 in the grep output buffer,
-to go to the lines where grep found matches.
+to visit the lines where matches were found.  To kill the job
+before it finishes, type \\[kill-compilation].
 
 This command shares argument histories with \\[lgrep] and \\[grep-find].