[Emacs-diffs] /srv/bzr/emacs/trunk r104886: * simple.el (shell-command-on-region): Say where the error output

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 104886
fixes bug(s): http://debbugs.gnu.org/6857
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sat 2011-07-02 22:59:18 +0200
message:
  * simple.el (shell-command-on-region): Say where the error output
  went if `shell-command-default-error-buffer' is set.
modified:
  lisp/ChangeLog
  lisp/simple.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-02 17:39:41 +0000
+++ b/lisp/ChangeLog    2011-07-02 20:59:18 +0000
@@ -1,3 +1,8 @@
+2011-07-02  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * allout.el (allout-yank-processing): Adjust cursor position for

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2011-06-11 09:50:37 +0000
+++ b/lisp/simple.el    2011-07-02 20:59:18 +0000
@@ -2531,7 +2531,10 @@
            (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)"))