Mercurial > emacs

changeset 39690:38c1890338cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(keymap_panes, Fx_popup_menu): Use Fkeymap_prompt.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 08 Oct 2001 11:12:23 +0000
parents 0572449a62be
children 27fe3d5767ed
files src/w32menu.c src/xmenu.c
diffstat 2 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/w32menu.c	Mon Oct 08 09:47:10 2001 +0000
+++ b/src/w32menu.c	Mon Oct 08 11:12:23 2001 +0000
@@ -25,6 +25,7 @@
 #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 @@
      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 @@
 
       /* 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 @@
 
 	  maps[i++] = keymap = get_keymap (Fcar (tem), 1, 0);
 
-	  prompt = map_prompt (keymap);
+	  prompt = Fkeymap_prompt (keymap);
 	  if (NILP (title) && !NILP (prompt))
 	    title = prompt;
 	}
--- a/src/xmenu.c	Mon Oct 08 09:47:10 2001 +0000
+++ b/src/xmenu.c	Mon Oct 08 11:12:23 2001 +0000
@@ -40,6 +40,7 @@
 #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 @@
      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 @@
 
       /* 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 @@
 
 	  maps[i++] = keymap = get_keymap (Fcar (tem), 1, 0);
 
-	  prompt = map_prompt (keymap);
+	  prompt = Fkeymap_prompt (keymap);
 	  if (NILP (title) && !NILP (prompt))
 	    title = prompt;
 	}