From 5ee707b8f12eb9ac8cb815f77211a07e5bd9a781 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 8 Oct 2001 11:12:23 +0000 Subject: [PATCH] (keymap_panes, Fx_popup_menu): Use Fkeymap_prompt. --- src/w32menu.c | 7 ++++--- src/xmenu.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/w32menu.c b/src/w32menu.c index d627d889db..a30328e7ea 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -25,6 +25,7 @@ Boston, MA 02111-1307, USA. */ #include "lisp.h" #include "termhooks.h" #include "keyboard.h" +#include "keymap.h" #include "frame.h" #include "window.h" #include "blockinput.h" @@ -394,7 +395,7 @@ keymap_panes (keymaps, nmaps, notreal) P is the number of panes we have made so far. */ for (mapno = 0; mapno < nmaps; mapno++) single_keymap_panes (keymaps[mapno], - map_prompt (keymaps[mapno]), Qnil, notreal, 10); + Fkeymap_prompt (keymaps[mapno]), Qnil, notreal, 10); finish_menu_items (); } @@ -727,7 +728,7 @@ cached information about equivalent key sequences.") /* Search for a string appearing directly as an element of the keymap. That string is the title of the menu. */ - prompt = map_prompt (keymap); + prompt = Fkeymap_prompt (keymap); if (NILP (title) && !NILP (prompt)) title = prompt; @@ -755,7 +756,7 @@ cached information about equivalent key sequences.") maps[i++] = keymap = get_keymap (Fcar (tem), 1, 0); - prompt = map_prompt (keymap); + prompt = Fkeymap_prompt (keymap); if (NILP (title) && !NILP (prompt)) title = prompt; } diff --git a/src/xmenu.c b/src/xmenu.c index 6a7b86b1e1..e12099becf 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -40,6 +40,7 @@ Boston, MA 02111-1307, USA. */ #include "lisp.h" #include "termhooks.h" #include "keyboard.h" +#include "keymap.h" #include "frame.h" #include "window.h" #include "blockinput.h" @@ -380,7 +381,7 @@ keymap_panes (keymaps, nmaps, notreal) P is the number of panes we have made so far. */ for (mapno = 0; mapno < nmaps; mapno++) single_keymap_panes (keymaps[mapno], - map_prompt (keymaps[mapno]), Qnil, notreal, 10); + Fkeymap_prompt (keymaps[mapno]), Qnil, notreal, 10); finish_menu_items (); } @@ -798,7 +799,7 @@ cached information about equivalent key sequences.") /* Search for a string appearing directly as an element of the keymap. That string is the title of the menu. */ - prompt = map_prompt (keymap); + prompt = Fkeymap_prompt (keymap); if (NILP (title) && !NILP (prompt)) title = prompt; @@ -826,7 +827,7 @@ cached information about equivalent key sequences.") maps[i++] = keymap = get_keymap (Fcar (tem), 1, 0); - prompt = map_prompt (keymap); + prompt = Fkeymap_prompt (keymap); if (NILP (title) && !NILP (prompt)) title = prompt; } -- 2.20.1