(scan_lists): Follow coding convention.

[bpt/emacs.git] / src / xmenu.c

diff --git a/src/xmenu.c b/src/xmenu.c
index 14c7239..ad0ec34 100644 (file)
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1,6 +1,6 @@
 /* X Communication module for terminals which understand the X protocol.
    Copyright (C) 1986, 1988, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -248,10 +248,10 @@ menubar_id_to_frame (id)
   Lisp_Object tail, frame;
   FRAME_PTR f;
 
-  for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
+  for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))
     {
       frame = XCAR (tail);
-      if (!GC_FRAMEP (frame))
+      if (!FRAMEP (frame))
         continue;
       f = XFRAME (frame);
       if (!FRAME_WINDOW_P (f))
@@ -1561,10 +1561,10 @@ show_help_event (f, widget, help)
       xt_or_gtk_widget frame_widget = XtParent (widget);
       Lisp_Object tail;
 
-      for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
+      for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))
        {
          frame = XCAR (tail);
-         if (GC_FRAMEP (frame)
+         if (FRAMEP (frame)
              && (f = XFRAME (frame),
                  FRAME_X_P (f) && f->output_data.x->widget == frame_widget))
            break;
@@ -1630,7 +1630,7 @@ menu_highlight_callback (widget, id, call_data)
 static void
 find_and_call_menu_selection (f, menu_bar_items_used, vector, client_data)
      FRAME_PTR f;
-     int menu_bar_items_used;
+     EMACS_INT menu_bar_items_used;
      Lisp_Object vector;
      void *client_data;
 {
@@ -1943,7 +1943,7 @@ digest_single_submenu (start, end, top_level_items)
          if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name))
            {
              pane_name = ENCODE_MENU_STRING (pane_name);
-             AREF (menu_items, i + MENU_ITEMS_PANE_NAME) = pane_name;
+             ASET (menu_items, i + MENU_ITEMS_PANE_NAME, pane_name);
            }
 #endif
          pane_string = (NILP (pane_name)
@@ -1999,13 +1999,13 @@ digest_single_submenu (start, end, top_level_items)
           if (STRING_MULTIBYTE (item_name))
            {
              item_name = ENCODE_MENU_STRING (item_name);
-             AREF (menu_items, i + MENU_ITEMS_ITEM_NAME) = item_name;
+             ASET (menu_items, i + MENU_ITEMS_ITEM_NAME, item_name);
            }
 
           if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))
            {
              descrip = ENCODE_MENU_STRING (descrip);
-             AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY) = descrip;
+             ASET (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY, descrip);
            }
 #endif /* not HAVE_MULTILINGUAL_MENU */
 
@@ -2928,7 +2928,7 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
          if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name))
            {
              pane_name = ENCODE_MENU_STRING (pane_name);
-             AREF (menu_items, i + MENU_ITEMS_PANE_NAME) = pane_name;
+             ASET (menu_items, i + MENU_ITEMS_PANE_NAME, pane_name);
            }
 #endif
          pane_string = (NILP (pane_name)
@@ -2982,13 +2982,13 @@ xmenu_show (f, x, y, for_click, keymaps, title, error)
           if (STRINGP (item_name) && STRING_MULTIBYTE (item_name))
            {
              item_name = ENCODE_MENU_STRING (item_name);
-             AREF (menu_items, i + MENU_ITEMS_ITEM_NAME) = item_name;
+             ASET (menu_items, i + MENU_ITEMS_ITEM_NAME, item_name);
            }
 
           if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))
            {
              descrip = ENCODE_MENU_STRING (descrip);
-             AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY) = descrip;
+             ASET (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY, descrip);
            }
 #endif /* not HAVE_MULTILINGUAL_MENU */