diff src/window.c @ 40656:cdfd4d09b79a

Update usage of CHECK_ macros (remove unused second argument).

--- a/src/window.c	Fri Nov 02 20:14:02 2001 +0000
+++ b/src/window.c	Fri Nov 02 20:46:55 2001 +0000
@@ -294,7 +294,7 @@
 {
   if (NILP (frame))
     frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
   return FRAME_MINIBUF_WINDOW (XFRAME (frame));
 }
 
@@ -331,7 +331,7 @@
 
   if (!NILP (pos))
     {
-      CHECK_NUMBER_COERCE_MARKER (pos, 0);
+      CHECK_NUMBER_COERCE_MARKER (pos);
       posint = XINT (pos);
     }
   else if (w == XWINDOW (selected_window))
@@ -382,7 +382,7 @@
   if (NILP (window))
     return XWINDOW (selected_window);
 
-  CHECK_LIVE_WINDOW (window, 0);
+  CHECK_LIVE_WINDOW (window);
   return XWINDOW (window);
 }
 
@@ -430,7 +430,7 @@
   struct window *w = decode_window (window);
   int hscroll;
 
-  CHECK_NUMBER (ncol, 1);
+  CHECK_NUMBER (ncol);
   hscroll = max (0, XINT (ncol));
   
   /* Prevent redisplay shortcuts when changing the hscroll.  */
@@ -678,14 +678,14 @@
   int x, y;
   Lisp_Object lx, ly;
 
-  CHECK_LIVE_WINDOW (window, 0);
+  CHECK_LIVE_WINDOW (window);
   w = XWINDOW (window);
   f = XFRAME (w->frame);
-  CHECK_CONS (coordinates, 1);
+  CHECK_CONS (coordinates);
   lx = Fcar (coordinates);
   ly = Fcdr (coordinates);
-  CHECK_NUMBER_OR_FLOAT (lx, 1);
-  CHECK_NUMBER_OR_FLOAT (ly, 1);
+  CHECK_NUMBER_OR_FLOAT (lx);
+  CHECK_NUMBER_OR_FLOAT (ly);
   x = PIXEL_X_FROM_CANON_X (f, lx);
   y = PIXEL_Y_FROM_CANON_Y (f, ly);
 
@@ -816,12 +816,12 @@
 
   if (NILP (frame))
     frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 2);
+  CHECK_LIVE_FRAME (frame);
   f = XFRAME (frame);
 
   /* Check that arguments are integers or floats.  */
-  CHECK_NUMBER_OR_FLOAT (x, 0);
-  CHECK_NUMBER_OR_FLOAT (y, 1);
+  CHECK_NUMBER_OR_FLOAT (x);
+  CHECK_NUMBER_OR_FLOAT (y);
 
   return window_from_coordinates (f, 
 				  PIXEL_X_FROM_CANON_X (f, x),
@@ -885,7 +885,7 @@
   Lisp_Object buf;
 
   buf = w->buffer;
-  CHECK_BUFFER (buf, 0);
+  CHECK_BUFFER (buf);
 
 #if 0 /* This change broke some things.  We should make it later.  */
   /* If we don't know the end position, return nil.
@@ -946,7 +946,7 @@
 {
   register struct window *w = decode_window (window);
 
-  CHECK_NUMBER_COERCE_MARKER (pos, 1);
+  CHECK_NUMBER_COERCE_MARKER (pos);
   if (w == XWINDOW (selected_window)
       && XBUFFER (w->buffer) == current_buffer)
     Fgoto_char (pos);
@@ -970,7 +970,7 @@
 {
   register struct window *w = decode_window (window);
 
-  CHECK_NUMBER_COERCE_MARKER (pos, 1);
+  CHECK_NUMBER_COERCE_MARKER (pos);
   set_marker_restricted (w->start, pos, w->buffer);
   /* this is not right, but much easier than doing what is right. */
   w->start_at_line_beg = Qnil;
@@ -1195,7 +1195,7 @@
   if (NILP (window))
     window = selected_window;
   else
-    CHECK_WINDOW (window, 0);
+    CHECK_WINDOW (window);
   p = XWINDOW (window);
 
   /* It's okay to delete an already-deleted window.  */
@@ -1448,7 +1448,7 @@
   if (NILP (*window))
     *window = selected_window;
   else
-    CHECK_LIVE_WINDOW (*window, 0);
+    CHECK_LIVE_WINDOW (*window);
   
   /* MINIBUF nil may or may not include minibuffers.  Decide if it
      does.  */
@@ -1632,7 +1632,7 @@
   Lisp_Object window;
   int i;
 
-  CHECK_NUMBER (arg, 0);
+  CHECK_NUMBER (arg);
   window = selected_window;
   
   for (i = XINT (arg); i > 0; --i)
@@ -1990,7 +1990,7 @@
   if (NILP (window))
     window = selected_window;
   else
-    CHECK_LIVE_WINDOW (window, 0);
+    CHECK_LIVE_WINDOW (window);
   w = XWINDOW (window);
 
   startpos = marker_position (w->start);
@@ -2056,7 +2056,7 @@
   if (!NILP (buffer))
     {
       buffer = Fget_buffer (buffer);
-      CHECK_BUFFER (buffer, 0);
+      CHECK_BUFFER (buffer);
       window_loop (DELETE_BUFFER_WINDOWS, buffer, 0, frame);
     }
   
@@ -2073,7 +2073,7 @@
   if (!NILP (buffer))
     {
       buffer = Fget_buffer (buffer);
-      CHECK_BUFFER (buffer, 0);
+      CHECK_BUFFER (buffer);
       window_loop (UNSHOW_BUFFER, buffer, 0, Qt);
     }
   return Qnil;
@@ -2660,7 +2660,7 @@
 
   XSETWINDOW (window, w);
   buffer = Fget_buffer (buffer);
-  CHECK_BUFFER (buffer, 1);
+  CHECK_BUFFER (buffer);
 
   if (NILP (XBUFFER (buffer)->name))
     error ("Attempt to display deleted buffer");
@@ -2705,7 +2705,7 @@
   register struct window *ow;
   struct frame *sf;
 
-  CHECK_LIVE_WINDOW (window, 0);
+  CHECK_LIVE_WINDOW (window);
 
   w = XWINDOW (window);
   w->frozen_window_start_p = 0;
@@ -2802,7 +2802,7 @@
 {
   Lisp_Object tem;
 
-  CHECK_STRING (buffer_name, 1);
+  CHECK_STRING (buffer_name);
 
   tem = Fmember (buffer_name, Vspecial_display_buffer_names);
   if (!NILP (tem))
@@ -2834,7 +2834,7 @@
 {
   Lisp_Object tem;
 
-  CHECK_STRING (buffer_name, 1);
+  CHECK_STRING (buffer_name);
 
   tem = Fmember (buffer_name, Vsame_window_buffer_names);
   if (!NILP (tem))
@@ -2895,7 +2895,7 @@
 
   swp = Qnil;
   buffer = Fget_buffer (buffer);
-  CHECK_BUFFER (buffer, 0);
+  CHECK_BUFFER (buffer);
 
   if (!NILP (Vdisplay_buffer_function))
     return call2 (Vdisplay_buffer_function, buffer, not_this_window);
@@ -3165,7 +3165,7 @@
   if (NILP (window))
     window = selected_window;
   else
-    CHECK_LIVE_WINDOW (window, 0);
+    CHECK_LIVE_WINDOW (window);
 
   o = XWINDOW (window);
   fo = XFRAME (WINDOW_FRAME (o));
@@ -3183,7 +3183,7 @@
     }
   else
     {
-      CHECK_NUMBER (size, 1);
+      CHECK_NUMBER (size);
       size_int = XINT (size);
     }
 
@@ -3278,7 +3278,7 @@
      (arg, side)
      register Lisp_Object arg, side;
 {
-  CHECK_NUMBER (arg, 0);
+  CHECK_NUMBER (arg);
   enlarge_window (selected_window, XINT (arg), !NILP (side));
 
   if (! NILP (Vwindow_configuration_change_hook))
@@ -3294,7 +3294,7 @@
      (arg, side)
      register Lisp_Object arg, side;
 {
-  CHECK_NUMBER (arg, 0);
+  CHECK_NUMBER (arg);
   enlarge_window (selected_window, -XINT (arg), !NILP (side));
 
   if (! NILP (Vwindow_configuration_change_hook))
@@ -4349,7 +4349,7 @@
 	       && ! EQ (window, selected_window));
     }
 
-  CHECK_LIVE_WINDOW (window, 0);
+  CHECK_LIVE_WINDOW (window);
 
   if (EQ (window, selected_window))
     error ("There is no other window");
@@ -4394,7 +4394,7 @@
     {
       if (CONSP (arg))
 	arg = Fcar (arg);
-      CHECK_NUMBER (arg, 0);
+      CHECK_NUMBER (arg);
       window_scroll (window, XINT (arg), 0, 1);
     }
 
@@ -4549,7 +4549,7 @@
   else
     {
       arg = Fprefix_numeric_value (arg);
-      CHECK_NUMBER (arg, 0);
+      CHECK_NUMBER (arg);
     }
 
   set_buffer_internal (buf);
@@ -5271,7 +5271,7 @@
 
   if (NILP (frame))
     frame = selected_frame;
-  CHECK_LIVE_FRAME (frame, 0);
+  CHECK_LIVE_FRAME (frame);
   f = XFRAME (frame);
 
   n_windows = count_windows (XWINDOW (FRAME_ROOT_WINDOW (f)));
@@ -5340,9 +5340,9 @@
   struct window *w = decode_window (window);
 
   if (!NILP (left))
-    CHECK_NUMBER_OR_FLOAT (left, 1);
+    CHECK_NUMBER_OR_FLOAT (left);
   if (!NILP (right))
-    CHECK_NUMBER_OR_FLOAT (right, 2);
+    CHECK_NUMBER_OR_FLOAT (right);
 
   /* Check widths < 0 and translate a zero width to nil.
      Margins that are too wide have to be checked elsewhere.  */
@@ -5401,7 +5401,7 @@
   if (NILP (window))
     window = selected_window;
   else
-    CHECK_WINDOW (window, 0);
+    CHECK_WINDOW (window);
   w = XWINDOW (window);
   f = XFRAME (w->frame);
   
@@ -5427,8 +5427,8 @@
   if (NILP (window))
     window = selected_window;
   else
-    CHECK_WINDOW (window, 0);
-  CHECK_NUMBER_OR_FLOAT (vscroll, 1);
+    CHECK_WINDOW (window);
+  CHECK_NUMBER_OR_FLOAT (vscroll);
   
   w = XWINDOW (window);
   f = XFRAME (w->frame);