aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/simple.el14
2 files changed, 9 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 31ef1b514e..21db50ad56 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
* mouse-sel.el (mouse-sel-mode): Specify custom group.
+ * simple.el (process-file): Fix logic.
+
2004-10-24 Luc Teirlinck <[email protected]>
* indent.el (set-left-margin, set-right-margin): Delete redundant
diff --git a/lisp/simple.el b/lisp/simple.el
index 05b8c85930..2665e4c763 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1901,13 +1901,13 @@ value passed."
(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)))))