diff options
| author | Chong Yidong | 2009-11-14 16:07:44 +0000 |
|---|---|---|
| committer | Chong Yidong | 2009-11-14 16:07:44 +0000 |
| commit | e779144743d853c7ce79bd105bae8285725890be (patch) | |
| tree | 54cd582d26fa17523de0f4d6b0d6d51f99f3713f | |
| parent | aec5395b0c5a295dc42d6eb83bfe4e89234bd738 (diff) | |
| download | emacs-e779144743d853c7ce79bd105bae8285725890be.tar.gz emacs-e779144743d853c7ce79bd105bae8285725890be.zip | |
* simple.el (shell-command): Doc fix (Bug#4891).
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/simple.el | 3 |
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 @@ | |||
| 1 | 2009-11-14 Chong Yidong <cyd@stupidchicken.com> | 1 | 2009-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 | ||
| 5 | 2009-11-14 Glenn Morris <rgm@gnu.org> | 7 | 2009-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. | |||
| 2110 | If OUTPUT-BUFFER is a buffer or buffer name, put the output there. | 2110 | If OUTPUT-BUFFER is a buffer or buffer name, put the output there. |
| 2111 | If OUTPUT-BUFFER is not a buffer and not nil, | 2111 | If OUTPUT-BUFFER is not a buffer and not nil, |
| 2112 | insert output in current buffer. (This cannot be done asynchronously.) | 2112 | insert output in current buffer. (This cannot be done asynchronously.) |
| 2113 | In either case, the output is inserted after point (leaving mark after it). | 2113 | In either case, the buffer is first erased, and the output is |
| 2114 | inserted after point (leaving mark after it). | ||
| 2114 | 2115 | ||
| 2115 | If the command terminates without error, but generates output, | 2116 | If the command terminates without error, but generates output, |
| 2116 | and you did not specify \"insert it in the current buffer\", | 2117 | and you did not specify \"insert it in the current buffer\", |