diff src/lread.c @ 90054:f2ebccfa87d4

Revision: [e-mail]--gnu-2004/emacs--unicode--0--patch-74 Merge from emacs--cvs-trunk--0 Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-709 Update from CVS: src/indent.c (Fvertical_motion): Fix last change. * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-710 - [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-715 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-716 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/gnus--rel--5.10--patch-74 Update from CVS

--- a/src/lread.c	Mon Dec 06 12:38:25 2004 +0000
+++ b/src/lread.c	Wed Dec 08 05:02:30 2004 +0000
@@ -1,6 +1,6 @@
 /* Lisp parsing and input streams.
-   Copyright (C) 1985,86,87,88,89,93,94,95,97,98,99,2000,01,03,2004
-      Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995, 1997, 1998,
+     1999, 2000, 2001, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -484,12 +484,13 @@
 
   c = getc (instream);
 #ifdef EINTR
-  /* Interrupted reads have been observed while reading over the network */
-  while (c == EOF && ferror (instream) && errno == EINTR)
-    {
-      clearerr (instream);
-      c = getc (instream);
-    }
+      /* Interrupted reads have been observed while reading over the network */
+      while (c == EOF && ferror (instream) && errno == EINTR)
+	{
+	  QUIT;
+	  clearerr (instream);
+	  c = getc (instream);
+	}
 #endif
   return (c == EOF ? -1 : c);
 }
@@ -3414,7 +3415,7 @@
   hash %= obsize;
   bucket = XVECTOR (obarray)->contents[hash];
   oblookup_last_bucket_number = hash;
-  if (XFASTINT (bucket) == 0)
+  if (EQ (bucket, make_number (0)))
     ;
   else if (!SYMBOLP (bucket))
     error ("Bad data in guts of obarray"); /* Like CADR error message */