diff options
| author | Andreas Schwab | 2002-06-29 18:16:27 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2002-06-29 18:16:27 +0000 |
| commit | 637fff820c1346a3aca21738830aed86190d3bda (patch) | |
| tree | 2920ab210fa08af4bf6ac8681e9043f3a99f24bb | |
| parent | 61b80ebf7f608cc2914d706ea4d167598e0d1b10 (diff) | |
| download | emacs-637fff820c1346a3aca21738830aed86190d3bda.tar.gz emacs-637fff820c1346a3aca21738830aed86190d3bda.zip | |
(shell-command-default-error-buffer): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 1 | ||||
| -rw-r--r-- | lisp/simple.el | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 85069b254ee..c8873bec3a0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * simple.el (shell-command-on-region): Handle errors and signals | 3 | * simple.el (shell-command-on-region): Handle errors and signals |
| 4 | from shell command execution. | 4 | from shell command execution. |
| 5 | (display-message-or-buffer): Fix last change. | 5 | (display-message-or-buffer): Fix last change. |
| 6 | (shell-command-default-error-buffer): Doc fix. | ||
| 6 | 7 | ||
| 7 | * dired.el (dired-view-file): Quote file name for | 8 | * dired.el (dired-view-file): Quote file name for |
| 8 | dired-run-shell-command. | 9 | dired-run-shell-command. |
diff --git a/lisp/simple.el b/lisp/simple.el index 416b6934f5e..f3fbbec58a8 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -1154,7 +1154,7 @@ is not *inside* the region START...END." | |||
| 1154 | 1154 | ||
| 1155 | (defvar shell-command-default-error-buffer nil | 1155 | (defvar shell-command-default-error-buffer nil |
| 1156 | "*Buffer name for `shell-command' and `shell-command-on-region' error output. | 1156 | "*Buffer name for `shell-command' and `shell-command-on-region' error output. |
| 1157 | This buffer is used when `shell-command' or 'shell-command-on-region' | 1157 | This buffer is used when `shell-command' or `shell-command-on-region' |
| 1158 | is run interactively. A value of nil means that output to stderr and | 1158 | is run interactively. A value of nil means that output to stderr and |
| 1159 | stdout will be intermixed in the output stream.") | 1159 | stdout will be intermixed in the output stream.") |
| 1160 | 1160 | ||