aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/process.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c4db25cb2d9..9331c2365ba 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12004-01-20 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * process.c (wait_reading_process_input): Lisp_Object/int mixup.
4
5 * dired.c (Ffile_attributes): Lisp_Object/int mixup.
6
12004-01-19 Kenichi Handa <handa@m17n.org> 72004-01-19 Kenichi Handa <handa@m17n.org>
2 8
3 * fontset.c (fontset_font_pattern): Fix previous change. 9 * fontset.c (fontset_font_pattern): Fix previous change.
diff --git a/src/process.c b/src/process.c
index 315b31b728f..854607a2230 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1,6 +1,6 @@
1/* Asynchronous subprocess control for GNU Emacs. 1/* Asynchronous subprocess control for GNU Emacs.
2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 96, 98, 1999, 2 Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 96, 98, 1999,
3 2001, 2002, 2003 Free Software Foundation, Inc. 3 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
6 6
@@ -4296,7 +4296,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
4296 proc = chan_process[channel]; 4296 proc = chan_process[channel];
4297 if (NILP (proc)) 4297 if (NILP (proc))
4298 continue; 4298 continue;
4299 if (XPROCESS (proc)->read_output_delay > 0) 4299 if (XINT (XPROCESS (proc)->read_output_delay) > 0)
4300 { 4300 {
4301 check_delay--; 4301 check_delay--;
4302 if (NILP (XPROCESS (proc)->read_output_skip)) 4302 if (NILP (XPROCESS (proc)->read_output_skip))