From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 23 Nov 2004 05:05:34 +0000 (+0000)
Subject: (Fset_window_scroll_bars): Don't use XINT if it isn't int.
X-Git-Tag: ttn-vms-21-2-B4~3730
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0f8fe9a26f2f11b85b3577f47372a860c9a0d53a;p=emacs.git

(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 --git a/src/window.c b/src/window.c
index 39fa03c2879..f7a7a4c438c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1611,7 +1611,7 @@ decode_next_window_args (window, minibuf, all_frames)
 		   : 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 @@ window_loop (type, obj, mini, frames)
 
   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 @@ If TYPE is t, use the frame's scroll-bar type.  */)
   struct window *w = decode_window (window);
 
   if (!NILP (width))
-    CHECK_NATNUM (width);
+    {
+      CHECK_NATNUM (width);
 
-  if (XINT (width) == 0)
-    vertical_type = Qnil;
+      if (XINT (width) == 0)
+	vertical_type = Qnil;
+    }
 
   if (!(EQ (vertical_type, Qnil)
 	|| EQ (vertical_type, Qleft)