diff options
Diffstat (limited to 'lisp')
| -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 @@ +2011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * simple.el (shell-command-on-region): Say where the error output + went if `shell-command-default-error-buffer' is set (bug#6857). + 2011-07-02 Ken Manheimer <ken.manheimer@gmail.com> * 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." (let ((output (if (and error-file (< 0 (nth 7 (file-attributes error-file)))) - "some error output" + (format "some error output%s" + (if shell-command-default-error-buffer + (format " to the \"%s\" buffer" shell-command-default-error-buffer) + "")) "no output"))) (cond ((null exit-status) (message "(Shell command failed with error)")) |