[Emacs-diffs] Changes to emacs/src/w32menu.c

[Jason Rumney]

Index: emacs/src/w32menu.c
diff -u emacs/src/w32menu.c:1.41 emacs/src/w32menu.c:1.42
--- emacs/src/w32menu.c:1.41    Mon Oct 29 22:38:24 2001
+++ emacs/src/w32menu.c Fri Nov  2 15:35:06 2001
@@ -548,10 +548,10 @@
       Lisp_Object elt, pane_name, pane_data;
       elt = Fcar (tail);
       pane_name = Fcar (elt);
-      CHECK_STRING (pane_name, 0);
+      CHECK_STRING (pane_name);
       push_menu_pane (pane_name, Qnil);
       pane_data = Fcdr (elt);
-      CHECK_CONS (pane_data, 0);
+      CHECK_CONS (pane_data);
       list_of_items (pane_data);
     }
 
@@ -575,9 +575,9 @@
        push_left_right_boundary ();
       else
        {
-         CHECK_CONS (item, 0);
+         CHECK_CONS (item);
          item1 = Fcar (item);
-         CHECK_STRING (item1, 1);
+         CHECK_STRING (item1);
          push_menu_item (item1, Qt, Fcdr (item), Qt, Qnil, Qnil, Qnil, Qnil);
        }
     }
@@ -678,8 +678,8 @@
            }
        }
 
-      CHECK_NUMBER (x, 0);
-      CHECK_NUMBER (y, 0);
+      CHECK_NUMBER (x);
+      CHECK_NUMBER (y);
 
       /* Decode where to put the menu.  */
 
@@ -691,7 +691,7 @@
        }
       else if (WINDOWP (window))
        {
-         CHECK_LIVE_WINDOW (window, 0);
+         CHECK_LIVE_WINDOW (window);
          f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
 
          xpos = (FONT_WIDTH (FRAME_FONT (f))
@@ -702,7 +702,7 @@
       else
        /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
           but I don't want to make one now.  */
-       CHECK_WINDOW (window, 0);
+       CHECK_WINDOW (window);
 
       xpos += XINT (x);
       ypos += XINT (y);
@@ -774,7 +774,7 @@
     {
       /* We were given an old-fashioned menu.  */
       title = Fcar (menu);
-      CHECK_STRING (title, 1);
+      CHECK_STRING (title);
 
       list_of_panes (Fcdr (menu));
 
@@ -875,13 +875,13 @@
     f = XFRAME (window);
   else if (WINDOWP (window))
     {
-      CHECK_LIVE_WINDOW (window, 0);
+      CHECK_LIVE_WINDOW (window);
       f = XFRAME (WINDOW_FRAME (XWINDOW (window)));
     }
   else
     /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
        but I don't want to make one now.  */
-    CHECK_WINDOW (window, 0);
+    CHECK_WINDOW (window);
 
 #ifndef HAVE_DIALOGS
   /* Display a menu with these alternatives
@@ -904,7 +904,7 @@
 
     /* Decode the dialog items from what was specified.  */
     title = Fcar (contents);
-    CHECK_STRING (title, 1);
+    CHECK_STRING (title);
 
     list_of_panes (Fcons (contents, Qnil));