aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-11-14 16:07:44 +0000
committerChong Yidong2009-11-14 16:07:44 +0000
commite779144743d853c7ce79bd105bae8285725890be (patch)
tree54cd582d26fa17523de0f4d6b0d6d51f99f3713f
parentaec5395b0c5a295dc42d6eb83bfe4e89234bd738 (diff)
downloademacs-e779144743d853c7ce79bd105bae8285725890be.tar.gz
emacs-e779144743d853c7ce79bd105bae8285725890be.zip
* simple.el (shell-command): Doc fix (Bug#4891).
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/simple.el3
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f8e2bb0a1dd..d9d59eebc08 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12009-11-14 Chong Yidong <cyd@stupidchicken.com> 12009-11-14 Chong Yidong <cyd@stupidchicken.com>
2 2
3 * simple.el (shell-command): Doc fix (Bug#4891).
4
3 * help-mode.el (help-make-xrefs): Revert 2009-11-13 change. 5 * help-mode.el (help-make-xrefs): Revert 2009-11-13 change.
4 6
52009-11-14 Glenn Morris <rgm@gnu.org> 72009-11-14 Glenn Morris <rgm@gnu.org>
diff --git a/lisp/simple.el b/lisp/simple.el
index 180c8ef6f5d..2d01542355e 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2110,7 +2110,8 @@ says to put the output in some other buffer.
2110If OUTPUT-BUFFER is a buffer or buffer name, put the output there. 2110If OUTPUT-BUFFER is a buffer or buffer name, put the output there.
2111If OUTPUT-BUFFER is not a buffer and not nil, 2111If OUTPUT-BUFFER is not a buffer and not nil,
2112insert output in current buffer. (This cannot be done asynchronously.) 2112insert output in current buffer. (This cannot be done asynchronously.)
2113In either case, the output is inserted after point (leaving mark after it). 2113In either case, the buffer is first erased, and the output is
2114inserted after point (leaving mark after it).
2114 2115
2115If the command terminates without error, but generates output, 2116If the command terminates without error, but generates output,
2116and you did not specify \"insert it in the current buffer\", 2117and you did not specify \"insert it in the current buffer\",