*** empty log message ***

2 files changed, 7 insertions, 8 deletions

diff --git a/src/dispnew.c b/src/dispnew.c
index 102a8f28e64..fbfe3b702e7 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1860,6 +1860,9 @@ sit_for (sec, usec, reading, display)
   if (display)
     redisplay_preserve_echo_area ();
 
+  if (sec == 0 && usec == 0)
+    return Qt;
+
 #ifdef SIGIO
   gobble_input ();
 #endif
@@ -1907,10 +1910,6 @@ Value is t if waited the full time with no input arriving.")
 
   CHECK_NUMBER (arg, 0);
 
-  sec = XINT (arg);
-  if (sec <= 0)
-    return Qt;
-
   if (!NILP (millisec))
     {
 #ifndef EMACS_HAS_USECS
diff --git a/src/lread.c b/src/lread.c
index 930a9e56839..9477a11c421 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -513,21 +513,21 @@ point remains at the end of the last character read from the buffer.")
   int count = specpdl_ptr - specpdl;
   Lisp_Object tem, buf;
 
-  if (NIL_P (bufname))
+  if (NILP (bufname))
     buf = Fcurrent_buffer ();
   else
     buf = Fget_buffer (bufname);
-  if (NIL_P (buf))
+  if (NILP (buf))
     error ("No such buffer.");
 
-  if (NIL_P (printflag))
+  if (NILP (printflag))
     tem = Qsymbolp;
   else
     tem = printflag;
   specbind (Qstandard_output, tem);
   record_unwind_protect (save_excursion_restore, save_excursion_save ());
   BUF_SET_PT (XBUFFER (buf), BUF_BEGV (XBUFFER (buf)));
-  readevalloop (buf, 0, Feval, !NIL_P (printflag));
+  readevalloop (buf, 0, Feval, !NILP (printflag));
   unbind_to (count);
 
   return Qnil;