# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1101186334 0
# Node ID f3a76c43ac80f074374dc87b95b30317388404e9
# Parent  be0cfc84ea0f13d2893b9ee9de503fc18c495455
(Fset_window_scroll_bars): Don't use XINT if it isn't int.
(decode_next_window_args, window_loop): Don't use XFASTINT blindly.

diff -r be0cfc84ea0f -r f3a76c43ac80 src/window.c
--- a/src/window.c	Tue Nov 23 00:51:55 2004 +0000
+++ b/src/window.c	Tue Nov 23 05:05:34 2004 +0000
@@ -1611,7 +1611,7 @@
 		   : Qnil);
   else if (EQ (*all_frames, Qvisible))
     ;
-  else if (XFASTINT (*all_frames) == 0)
+  else if (EQ (*all_frames, make_number (0)))
     ;
   else if (FRAMEP (*all_frames))
     ;
@@ -1885,7 +1885,7 @@
 
   if (f)
     frame_arg = Qlambda;
-  else if (XFASTINT (frames) == 0)
+  else if (EQ (frames, make_number (0)))
     frame_arg = frames;
   else if (EQ (frames, Qvisible))
     frame_arg = frames;
@@ -6181,10 +6181,12 @@
   struct window *w = decode_window (window);
 
   if (!NILP (width))
-    CHECK_NATNUM (width);
-
-  if (XINT (width) == 0)
-    vertical_type = Qnil;
+    {
+      CHECK_NATNUM (width);
+
+      if (XINT (width) == 0)
+	vertical_type = Qnil;
+    }
 
   if (!(EQ (vertical_type, Qnil)
 	|| EQ (vertical_type, Qleft)