Mercurial > emacs
diff lisp/simple.el @ 83223:4056279af756
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-639
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-640
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-641
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-642
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-643
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-644
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-645
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-646
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-647
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-648
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-649
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-650
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-651
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-652
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-59
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-60
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-61
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-62
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-63
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-263
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sun, 31 Oct 2004 02:05:24 +0000 |
| parents | ae7fab96922c 4d4bfb9781e1 |
| children | 7a0245dd1848 |
line wrap: on
line diff
--- a/lisp/simple.el Mon Oct 25 18:17:28 2004 +0000 +++ b/lisp/simple.el Sun Oct 31 02:05:24 2004 +0000 @@ -1901,13 +1901,13 @@ (if fh (apply fh 'process-file program infile buffer display args) (when infile (setq lc (file-local-copy infile))) (setq stderr-file (when (and (consp buffer) (stringp (cadr buffer))) - (make-temp-file "emacs")))) - (prog1 - (apply 'call-process program - (or lc infile) - (if stderr-file (list (car buffer) stderr-file) buffer) - display args) - (when stderr-file (copy-file stderr-file (cadr buffer)))) + (make-temp-file "emacs"))) + (prog1 + (apply 'call-process program + (or lc infile) + (if stderr-file (list (car buffer) stderr-file) buffer) + display args) + (when stderr-file (copy-file stderr-file (cadr buffer))))) (when stderr-file (delete-file stderr-file)) (when lc (delete-file lc)))))