Mercurial > emacs
changeset 39692:e479fa559f2e
(map_prompt): Remove.
(read_char_x_menu_prompt, read_char_minibuf_menu_prompt): Use Fkeymap_prompt.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 08 Oct 2001 11:12:56 +0000 |
| parents | 27fe3d5767ed |
| children | 563617657e29 |
| files | src/keyboard.c |
| diffstat | 1 files changed, 3 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/keyboard.c Mon Oct 08 11:12:28 2001 +0000 +++ b/src/keyboard.c Mon Oct 08 11:12:56 2001 +0000 @@ -37,6 +37,7 @@ #include "dispextern.h" #include "syntax.h" #include "intervals.h" +#include "keymap.h" #include "blockinput.h" #include "puresize.h" #include "systime.h" @@ -6338,25 +6339,6 @@ -/* Return the prompt-string of a sparse keymap. - This is the first element which is a string. - Return nil if there is none. */ - -Lisp_Object -map_prompt (map) - Lisp_Object map; -{ - while (CONSP (map)) - { - register Lisp_Object tem; - tem = Fcar (map); - if (STRINGP (tem)) - return tem; - map = Fcdr (map); - } - return Qnil; -} - static void menu_bar_item P_ ((Lisp_Object, Lisp_Object)); static void menu_bar_one_keymap P_ ((Lisp_Object)); @@ -7446,7 +7428,7 @@ /* Get the menu name from the first map that has one (a prompt string). */ for (mapno = 0; mapno < nmaps; mapno++) { - name = map_prompt (maps[mapno]); + name = Fkeymap_prompt (maps[mapno]); if (!NILP (name)) break; } @@ -7556,7 +7538,7 @@ /* Get the menu name from the first map that has one (a prompt string). */ for (mapno = 0; mapno < nmaps; mapno++) { - name = map_prompt (maps[mapno]); + name = Fkeymap_prompt (maps[mapno]); if (!NILP (name)) break; }