[Emacs-diffs] Changes to emacs/src/dispnew.c,v

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  06/07/11 22:54:29

Index: dispnew.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/dispnew.c,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -b -r1.375 -r1.376
--- dispnew.c   11 Jul 2006 20:09:26 -0000      1.375
+++ dispnew.c   11 Jul 2006 22:54:28 -0000      1.376
@@ -6519,17 +6519,21 @@
   if (do_display >= 2)
     redisplay_preserve_echo_area (2);
 
-  if (FLOATP (timeout))
+  if (INTEGERP (timeout))
     {
-      double seconds = XFLOAT_DATA (timeout);
+      sec = XFASTINT (timeout);
+      usec = 0;
+    }
+  else if (FLOATP (timeout))
+    {
+      double seconds;
+
+      seconds = XFLOAT_DATA (timeout);
       sec = (int) seconds;
       usec = (int) ((seconds - sec) * 1000000);
     }
   else
-    {
-      sec = XFASTINT (timeout);
-      usec = 0;
-    }
+    wrong_type_argument (Qnumberp, timeout);
 
   if (sec == 0 && usec == 0)
     return Qt;