Mercurial > emacs
diff src/xmenu.c @ 25646:9154af188477
Use XCAR and XCDR instead of explicit member references.
author | Ken Raeburn <raeburn@raeburn.org> |
---|---|
date | Sun, 12 Sep 1999 07:05:34 +0000 |
parents | 824b89fca192 |
children | 841eb01263ef |
line wrap: on
line diff
--- a/src/xmenu.c Sun Sep 12 05:07:01 1999 +0000 +++ b/src/xmenu.c Sun Sep 12 07:05:34 1999 +0000 @@ -211,9 +211,9 @@ Lisp_Object tail, frame; FRAME_PTR f; - for (tail = Vframe_list; GC_CONSP (tail); tail = XCONS (tail)->cdr) + for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail)) { - frame = XCONS (tail)->car; + frame = XCAR (tail); if (!GC_FRAMEP (frame)) continue; f = XFRAME (frame); @@ -417,14 +417,14 @@ notbuttons = menu_items_used; #endif - for (tail = keymap; CONSP (tail); tail = XCONS (tail)->cdr) + for (tail = keymap; CONSP (tail); tail = XCDR (tail)) { GCPRO2 (keymap, pending_maps); /* Look at each key binding, and if it is a menu item add it to this menu. */ - item = XCONS (tail)->car; + item = XCAR (tail); if (CONSP (item)) - single_menu_item (XCONS (item)->car, XCONS (item)->cdr, + single_menu_item (XCAR (item), XCDR (item), &pending_maps, notreal, maxdepth, ¬buttons); else if (VECTORP (item)) { @@ -447,12 +447,12 @@ { Lisp_Object elt, eltcdr, string; elt = Fcar (pending_maps); - eltcdr = XCONS (elt)->cdr; - string = XCONS (eltcdr)->car; + eltcdr = XCDR (elt); + string = XCAR (eltcdr); /* We no longer discard the @ from the beginning of the string here. Instead, we do this in xmenu_show. */ single_keymap_panes (Fcar (elt), string, - XCONS (eltcdr)->cdr, notreal, maxdepth - 1); + XCDR (eltcdr), notreal, maxdepth - 1); pending_maps = Fcdr (pending_maps); } } @@ -705,7 +705,7 @@ /* Decode the first argument: find the window and the coordinates. */ if (EQ (position, Qt) - || (CONSP (position) && EQ (XCONS (position)->car, Qmenu_bar))) + || (CONSP (position) && EQ (XCAR (position), Qmenu_bar))) { /* Use the mouse's current position. */ FRAME_PTR new_f = selected_frame; @@ -903,7 +903,7 @@ /* Decode the first argument: find the window or frame to use. */ if (EQ (position, Qt) - || (CONSP (position) && EQ (XCONS (position)->car, Qmenu_bar))) + || (CONSP (position) && EQ (XCAR (position), Qmenu_bar))) { #if 0 /* Using the frame the mouse is on may not be right. */ /* Use the mouse's current position. */