Mercurial > emacs
comparison src/w32menu.c @ 39690:38c1890338cc
(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 | 5f60884970a8 |
| children | bf81460680f2 |
comparison
equal
deleted
inserted
replaced
| 39689:0572449a62be | 39690:38c1890338cc |
|---|---|
| 23 | 23 |
| 24 #include <stdio.h> | 24 #include <stdio.h> |
| 25 #include "lisp.h" | 25 #include "lisp.h" |
| 26 #include "termhooks.h" | 26 #include "termhooks.h" |
| 27 #include "keyboard.h" | 27 #include "keyboard.h" |
| 28 #include "keymap.h" | |
| 28 #include "frame.h" | 29 #include "frame.h" |
| 29 #include "window.h" | 30 #include "window.h" |
| 30 #include "blockinput.h" | 31 #include "blockinput.h" |
| 31 #include "buffer.h" | 32 #include "buffer.h" |
| 32 #include "charset.h" | 33 #include "charset.h" |
| 392 /* Loop over the given keymaps, making a pane for each map. | 393 /* Loop over the given keymaps, making a pane for each map. |
| 393 But don't make a pane that is empty--ignore that map instead. | 394 But don't make a pane that is empty--ignore that map instead. |
| 394 P is the number of panes we have made so far. */ | 395 P is the number of panes we have made so far. */ |
| 395 for (mapno = 0; mapno < nmaps; mapno++) | 396 for (mapno = 0; mapno < nmaps; mapno++) |
| 396 single_keymap_panes (keymaps[mapno], | 397 single_keymap_panes (keymaps[mapno], |
| 397 map_prompt (keymaps[mapno]), Qnil, notreal, 10); | 398 Fkeymap_prompt (keymaps[mapno]), Qnil, notreal, 10); |
| 398 | 399 |
| 399 finish_menu_items (); | 400 finish_menu_items (); |
| 400 } | 401 } |
| 401 | 402 |
| 402 /* This is a recursive subroutine of keymap_panes. | 403 /* This is a recursive subroutine of keymap_panes. |
| 725 /* Extract the detailed info to make one pane. */ | 726 /* Extract the detailed info to make one pane. */ |
| 726 keymap_panes (&menu, 1, NILP (position)); | 727 keymap_panes (&menu, 1, NILP (position)); |
| 727 | 728 |
| 728 /* Search for a string appearing directly as an element of the keymap. | 729 /* Search for a string appearing directly as an element of the keymap. |
| 729 That string is the title of the menu. */ | 730 That string is the title of the menu. */ |
| 730 prompt = map_prompt (keymap); | 731 prompt = Fkeymap_prompt (keymap); |
| 731 if (NILP (title) && !NILP (prompt)) | 732 if (NILP (title) && !NILP (prompt)) |
| 732 title = prompt; | 733 title = prompt; |
| 733 | 734 |
| 734 /* Make that be the pane title of the first pane. */ | 735 /* Make that be the pane title of the first pane. */ |
| 735 if (!NILP (prompt) && menu_items_n_panes >= 0) | 736 if (!NILP (prompt) && menu_items_n_panes >= 0) |
| 753 { | 754 { |
| 754 Lisp_Object prompt; | 755 Lisp_Object prompt; |
| 755 | 756 |
| 756 maps[i++] = keymap = get_keymap (Fcar (tem), 1, 0); | 757 maps[i++] = keymap = get_keymap (Fcar (tem), 1, 0); |
| 757 | 758 |
| 758 prompt = map_prompt (keymap); | 759 prompt = Fkeymap_prompt (keymap); |
| 759 if (NILP (title) && !NILP (prompt)) | 760 if (NILP (title) && !NILP (prompt)) |
| 760 title = prompt; | 761 title = prompt; |
| 761 } | 762 } |
| 762 | 763 |
| 763 /* Extract the detailed info to make one pane. */ | 764 /* Extract the detailed info to make one pane. */ |