Mercurial > emacs
comparison src/xmenu.c @ 7871:11fae1619e42
(single_keymap_panes): gcpro some things.
author | Karl Heuer <kwzh@gnu.org> |
---|---|
date | Mon, 13 Jun 1994 20:56:30 +0000 |
parents | 280cc1ac9f4a |
children | 60795e826dad |
comparison
equal
deleted
inserted
replaced
7870:537930034e73 | 7871:11fae1619e42 |
---|---|
488 pending_maps = Fcons (Fcons (def, Fcons (item_string, XCONS (item)->car)), | 488 pending_maps = Fcons (Fcons (def, Fcons (item_string, XCONS (item)->car)), |
489 pending_maps); | 489 pending_maps); |
490 else | 490 else |
491 { | 491 { |
492 Lisp_Object submap; | 492 Lisp_Object submap; |
493 GCPRO4 (keymap, pending_maps, descrip, item_string); | |
493 submap = get_keymap_1 (def, 0, 1); | 494 submap = get_keymap_1 (def, 0, 1); |
495 UNGCPRO; | |
494 #ifndef USE_X_TOOLKIT | 496 #ifndef USE_X_TOOLKIT |
495 /* Indicate visually that this is a submenu. */ | 497 /* Indicate visually that this is a submenu. */ |
496 if (!NILP (submap)) | 498 if (!NILP (submap)) |
497 item_string = concat2 (item_string, | 499 item_string = concat2 (item_string, |
498 build_string (" >")); | 500 build_string (" >")); |
553 pending_maps = Fcons (Fcons (def, Fcons (item_string, character)), | 555 pending_maps = Fcons (Fcons (def, Fcons (item_string, character)), |
554 pending_maps); | 556 pending_maps); |
555 else | 557 else |
556 { | 558 { |
557 Lisp_Object submap; | 559 Lisp_Object submap; |
560 GCPRO4 (keymap, pending_maps, descrip, item_string); | |
558 submap = get_keymap_1 (def, 0, 1); | 561 submap = get_keymap_1 (def, 0, 1); |
562 UNGCPRO; | |
559 #ifndef USE_X_TOOLKIT | 563 #ifndef USE_X_TOOLKIT |
560 if (!NILP (submap)) | 564 if (!NILP (submap)) |
561 item_string = concat2 (item_string, | 565 item_string = concat2 (item_string, |
562 build_string (" >")); | 566 build_string (" >")); |
563 #endif | 567 #endif |