summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1996-06-16 23:09:17 +0000
committerRichard M. Stallman <rms@gnu.org>1996-06-16 23:09:17 +0000
commit17554225e6fa1291ac0b2608889a56ef02057fbf (patch)
tree0c14cda31c7cdf5b36de00359a6a74c7e1ee22ba /src
parent6de2dc100b1f0018132ce86e8958cff8a1f7565b (diff)
downloademacs-17554225e6fa1291ac0b2608889a56ef02057fbf.tar.gz
(Fcall_process): Handle t or nil as STDERR_FILE.
Diffstat (limited to 'src')
-rw-r--r--src/callproc.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/callproc.c b/src/callproc.c
index 4d84c98edb7..3e79b6064f5 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -245,8 +245,16 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.")
if (CONSP (buffer))
{
if (CONSP (XCONS (buffer)->cdr))
- error_file = Fexpand_file_name (XCONS (XCONS (buffer)->cdr)->car,
- Qnil);
+ {
+ Lisp_Object file_for_stderr;
+ stderr_file = XCONS (XCONS (buffer)->cdr)->car;
+
+ if (NILP (stderr_file) || EQ (Qt, stderr_file))
+ error_file = stderr_file;
+ else
+ error_file = Fexpand_file_name (stderr_file, Qnil);
+ }
+
buffer = XCONS (buffer)->car;
}