[Emacs-diffs] Changes to emacs/src/lread.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/lread.c
diff -c emacs/src/lread.c:1.317.2.5 emacs/src/lread.c:1.317.2.6
*** emacs/src/lread.c:1.317.2.5 Fri Nov 12 02:52:55 2004
--- emacs/src/lread.c   Wed Dec  8 05:02:18 2004
***************
*** 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.
  
  This file is part of GNU Emacs.
  
--- 1,6 ----
  /* Lisp parsing and input streams.
!    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,495 ****
  
    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);
!     }
  #endif
    return (c == EOF ? -1 : c);
  }
--- 484,496 ----
  
    c = getc (instream);
  #ifdef EINTR
!       /* 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,3420 ****
    hash %= obsize;
    bucket = XVECTOR (obarray)->contents[hash];
    oblookup_last_bucket_number = hash;
!   if (XFASTINT (bucket) == 0)
      ;
    else if (!SYMBOLP (bucket))
      error ("Bad data in guts of obarray"); /* Like CADR error message */
--- 3415,3421 ----
    hash %= obsize;
    bucket = XVECTOR (obarray)->contents[hash];
    oblookup_last_bucket_number = hash;
!   if (EQ (bucket, make_number (0)))
      ;
    else if (!SYMBOLP (bucket))
      error ("Bad data in guts of obarray"); /* Like CADR error message */