aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorKai Großjohann2004-10-25 08:31:52 +0000
committerKai Großjohann2004-10-25 08:31:52 +0000
commit85af630d59f4e4bc75fc9cbbe341198ff31f4aaa (patch)
treecd096bd7ccfa30c0686849f515626feae970c0b0 /lisp
parent3acd2c4f888f8557829607bb23290da47eec529c (diff)
downloademacs-85af630d59f4e4bc75fc9cbbe341198ff31f4aaa.tar.gz
emacs-85af630d59f4e4bc75fc9cbbe341198ff31f4aaa.zip
(process-file): Fix logic.
Diffstat (limited to 'lisp')
-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 31ef1b514ef..21db50ad564 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
2 2
3 * mouse-sel.el (mouse-sel-mode): Specify custom group. 3 * mouse-sel.el (mouse-sel-mode): Specify custom group.
4 4
5 * simple.el (process-file): Fix logic.
6
52004-10-24 Luc Teirlinck <teirllm@auburn.edu> 72004-10-24 Luc Teirlinck <teirllm@auburn.edu>
6 8
7 * indent.el (set-left-margin, set-right-margin): Delete redundant 9 * indent.el (set-left-margin, set-right-margin): Delete redundant
diff --git a/lisp/simple.el b/lisp/simple.el
index 05b8c859306..2665e4c7639 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1901,13 +1901,13 @@ value passed."
1901 (if fh (apply fh 'process-file program infile buffer display args) 1901 (if fh (apply fh 'process-file program infile buffer display args)
1902 (when infile (setq lc (file-local-copy infile))) 1902 (when infile (setq lc (file-local-copy infile)))
1903 (setq stderr-file (when (and (consp buffer) (stringp (cadr buffer))) 1903 (setq stderr-file (when (and (consp buffer) (stringp (cadr buffer)))
1904 (make-temp-file "emacs")))) 1904 (make-temp-file "emacs")))
1905 (prog1 1905 (prog1
1906 (apply 'call-process program 1906 (apply 'call-process program
1907 (or lc infile) 1907 (or lc infile)
1908 (if stderr-file (list (car buffer) stderr-file) buffer) 1908 (if stderr-file (list (car buffer) stderr-file) buffer)
1909 display args) 1909 display args)
1910 (when stderr-file (copy-file stderr-file (cadr buffer)))) 1910 (when stderr-file (copy-file stderr-file (cadr buffer)))))
1911 (when stderr-file (delete-file stderr-file)) 1911 (when stderr-file (delete-file stderr-file))
1912 (when lc (delete-file lc))))) 1912 (when lc (delete-file lc)))))
1913 1913