[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/simple.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/simple.el [lexbind] |
Date: |
Sat, 04 Sep 2004 05:41:27 -0400 |
Index: emacs/lisp/simple.el
diff -c emacs/lisp/simple.el:1.551.2.23 emacs/lisp/simple.el:1.551.2.24
*** emacs/lisp/simple.el:1.551.2.23 Sat Sep 4 09:21:44 2004
--- emacs/lisp/simple.el Sat Sep 4 09:26:22 2004
***************
*** 1628,1634 ****
(defun shell-command-on-region (start end command
&optional output-buffer replace
! error-buffer)
"Execute string COMMAND in inferior shell with region as input.
Normally display output (if any) in temp buffer `*Shell Command Output*';
Prefix arg means replace the region with it. Return the exit code of
--- 1628,1634 ----
(defun shell-command-on-region (start end command
&optional output-buffer replace
! error-buffer display-error-buffer)
"Execute string COMMAND in inferior shell with region as input.
Normally display output (if any) in temp buffer `*Shell Command Output*';
Prefix arg means replace the region with it. Return the exit code of
***************
*** 1641,1650 ****
`buffer-file-coding-system'. If the output is going to replace the region,
then it is decoded from that same coding system.
! The noninteractive arguments are START, END, COMMAND, OUTPUT-BUFFER,
! REPLACE, ERROR-BUFFER. Noninteractive callers can specify coding
! systems by binding `coding-system-for-read' and
! `coding-system-for-write'.
If the command generates output, the output may be displayed
in the echo area or in a buffer.
--- 1641,1650 ----
`buffer-file-coding-system'. If the output is going to replace the region,
then it is decoded from that same coding system.
! The noninteractive arguments are START, END, COMMAND,
! OUTPUT-BUFFER, REPLACE, ERROR-BUFFER, and DISPLAY-ERROR-BUFFER.
! Noninteractive callers can specify coding systems by binding
! `coding-system-for-read' and `coding-system-for-write'.
If the command generates output, the output may be displayed
in the echo area or in a buffer.
***************
*** 1674,1679 ****
--- 1674,1681 ----
If optional sixth argument ERROR-BUFFER is non-nil, it is a buffer
or buffer name to which to direct the command's standard error output.
If it is nil, error output is mingled with regular output.
+ If DISPLAY-ERROR-BUFFER is non-nil, display the error buffer if there
+ were any errors. (This is always t, interactively.)
In an interactive call, the variable `shell-command-default-error-buffer'
specifies the value of ERROR-BUFFER."
(interactive (let (string)
***************
*** 1691,1697 ****
string
current-prefix-arg
current-prefix-arg
! shell-command-default-error-buffer)))
(let ((error-file
(if error-buffer
(make-temp-file
--- 1693,1700 ----
string
current-prefix-arg
current-prefix-arg
! shell-command-default-error-buffer
! t)))
(let ((error-file
(if error-buffer
(make-temp-file
***************
*** 1800,1806 ****
(format-insert-file error-file nil)
;; Put point after the inserted errors.
(goto-char (- (point-max) pos-from-end)))
! (display-buffer (current-buffer))))
(delete-file error-file))
exit-status))
--- 1803,1810 ----
(format-insert-file error-file nil)
;; Put point after the inserted errors.
(goto-char (- (point-max) pos-from-end)))
! (and display-error-buffer
! (display-buffer (current-buffer)))))
(delete-file error-file))
exit-status))
- [Emacs-diffs] Changes to emacs/lisp/simple.el [lexbind],
Miles Bader <=
- [Emacs-diffs] Changes to emacs/lisp/simple.el [lexbind], Miles Bader, 2004/09/04
- [Emacs-diffs] Changes to emacs/lisp/simple.el [lexbind], Miles Bader, 2004/09/04
- [Emacs-diffs] Changes to emacs/lisp/simple.el [lexbind], Miles Bader, 2004/09/04
- [Emacs-diffs] Changes to emacs/lisp/simple.el [lexbind], Miles Bader, 2004/09/15
- [Emacs-diffs] Changes to emacs/lisp/simple.el [lexbind], Miles Bader, 2004/09/15