From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 25 Nov 2000 08:48:13 +0000 (+0000)
Subject: (shell-command): Mention the effect of the prefix
X-Git-Tag: emacs-pretest-21.0.92~75
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0b3f96d4d8562084a456514e4821211471a2e639;p=emacs.git

(shell-command): Mention the effect of the prefix
argument in the doc string.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d5838342a64..8f0103d2a99 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-25  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* simple.el (shell-command): Mention the effect of the prefix
+	argument in the doc string.
+
 2000-11-25  Miles Bader  <miles@gnu.org>
 
 	* cus-face.el (custom-face-attributes): Add "None" choice to :stipple.
diff --git a/lisp/simple.el b/lisp/simple.el
index 47651b4b147..0e70e83a157 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1122,6 +1122,7 @@ stdout will be intermixed in the output stream.")
 
 (defun shell-command (command &optional output-buffer error-buffer)
   "Execute string COMMAND in inferior shell; display output, if any.
+With prefix argument, insert the COMMAND's output at point.
 
 If COMMAND ends in ampersand, execute it asynchronously.
 The output appears in the buffer `*Async Shell Command*'.