diff options
| author | Lars Magne Ingebrigtsen | 2011-07-02 22:59:18 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-07-02 22:59:18 +0200 |
| commit | e83cc1f76a22efef9576097a92c9cfb32298cfbb (patch) | |
| tree | 55ef02142f541a4429e13209e282150c9c01ae35 | |
| parent | e47ca23bcf56fc7d28e7edaa2785edeebecbdb51 (diff) | |
| download | emacs-e83cc1f76a22efef9576097a92c9cfb32298cfbb.tar.gz emacs-e83cc1f76a22efef9576097a92c9cfb32298cfbb.zip | |
* simple.el (shell-command-on-region): Say where the error output
went if `shell-command-default-error-buffer' is set.
Fixes: debbugs:6857
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/simple.el | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index de13574aa54..9a154c06a3d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * simple.el (shell-command-on-region): Say where the error output | ||
| 4 | went if `shell-command-default-error-buffer' is set (bug#6857). | ||
| 5 | |||
| 1 | 2011-07-02 Ken Manheimer <ken.manheimer@gmail.com> | 6 | 2011-07-02 Ken Manheimer <ken.manheimer@gmail.com> |
| 2 | 7 | ||
| 3 | * allout.el (allout-yank-processing): Adjust cursor position for | 8 | * allout.el (allout-yank-processing): Adjust cursor position for |
diff --git a/lisp/simple.el b/lisp/simple.el index b36cf2ec3ec..6c078830a18 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -2531,7 +2531,10 @@ specifies the value of ERROR-BUFFER." | |||
| 2531 | (let ((output | 2531 | (let ((output |
| 2532 | (if (and error-file | 2532 | (if (and error-file |
| 2533 | (< 0 (nth 7 (file-attributes error-file)))) | 2533 | (< 0 (nth 7 (file-attributes error-file)))) |
| 2534 | "some error output" | 2534 | (format "some error output%s" |
| 2535 | (if shell-command-default-error-buffer | ||
| 2536 | (format " to the \"%s\" buffer" shell-command-default-error-buffer) | ||
| 2537 | "")) | ||
| 2535 | "no output"))) | 2538 | "no output"))) |
| 2536 | (cond ((null exit-status) | 2539 | (cond ((null exit-status) |
| 2537 | (message "(Shell command failed with error)")) | 2540 | (message "(Shell command failed with error)")) |