(wait_reading_process_input): Lisp_Object/int mixup.

diff --git a/src/ChangeLog b/src/ChangeLog
index c4db25cb2d98eca39124a09144086ae15fe73924..9331c2365bad288ab12acaaaf081c57c5f508aea 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * process.c (wait_reading_process_input): Lisp_Object/int mixup.
+
+       * dired.c (Ffile_attributes): Lisp_Object/int mixup.
+
 2004-01-19  Kenichi Handa  <handa@m17n.org>
 
        * fontset.c (fontset_font_pattern): Fix previous change.

diff --git a/src/process.c b/src/process.c
index 315b31b728fc75dd5301c80f3043c0917b5daf77..854607a2230332564eaceb44ad8583160a703f76 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -1,6 +1,6 @@
 /* Asynchronous subprocess control for GNU Emacs.
    Copyright (C) 1985, 86, 87, 88, 93, 94, 95, 96, 98, 1999,
-      2001, 2002, 2003 Free Software Foundation, Inc.
+      2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -4296,7 +4296,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display)
                  proc = chan_process[channel];
                  if (NILP (proc))
                    continue;
-                 if (XPROCESS (proc)->read_output_delay > 0)
+                 if (XINT (XPROCESS (proc)->read_output_delay) > 0)
                    {
                      check_delay--;
                      if (NILP (XPROCESS (proc)->read_output_skip))