(keymap_panes, Fx_popup_menu): Use Fkeymap_prompt.

diff --git a/src/w32menu.c b/src/w32menu.c
index d627d889db5c2f87d0fd7ab45320f12e278450de..a30328e7ea98b40efafa0b0737ae363e2d59af00 100644 (file)
--- 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 6a7b86b1e109884fc0464e2610098c51063e9257..e12099becf373c3ead9aec65f05cc2b6a60f2350 100644 (file)
--- 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;
        }