Mercurial > emacs
comparison src/xmenu.c @ 3747:6506b2fd475a
(xmenu_show): Store 0 in *ERROR at the beginning.
(Fx_popup_menu): Call keymap_panes right in one-keymap case.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 15 Jun 1993 23:17:10 +0000 |
| parents | 33a309357161 |
| children | 340c18d50337 |
comparison
equal
deleted
inserted
replaced
| 3746:4a96c64c4d5e | 3747:6506b2fd475a |
|---|---|
| 190 if (!NILP (prompt)) | 190 if (!NILP (prompt)) |
| 191 title = (char *) XSTRING (prompt)->data; | 191 title = (char *) XSTRING (prompt)->data; |
| 192 | 192 |
| 193 /* Extract the detailed info to make one pane. */ | 193 /* Extract the detailed info to make one pane. */ |
| 194 number_of_panes = keymap_panes (&obj_list, &menus, &names, &enables, | 194 number_of_panes = keymap_panes (&obj_list, &menus, &names, &enables, |
| 195 &items, &menu, 1); | 195 &items, &prefixes, &menu, 1); |
| 196 /* The menu title seems to be ignored, | 196 /* The menu title seems to be ignored, |
| 197 so put it in the pane title. */ | 197 so put it in the pane title. */ |
| 198 if (menus[0] == 0) | 198 if (menus[0] == 0) |
| 199 menus[0] = title; | 199 menus[0] = title; |
| 200 } | 200 } |
| 327 /* struct indices *datap, *datap_save; */ | 327 /* struct indices *datap, *datap_save; */ |
| 328 char *datap; | 328 char *datap; |
| 329 int ulx, uly, width, height; | 329 int ulx, uly, width, height; |
| 330 int dispwidth, dispheight; | 330 int dispwidth, dispheight; |
| 331 | 331 |
| 332 *error = 0; | |
| 332 if (pane_cnt == 0) | 333 if (pane_cnt == 0) |
| 333 return 0; | 334 return 0; |
| 334 | 335 |
| 335 BLOCK_INPUT; | 336 BLOCK_INPUT; |
| 336 *error = (char *) 0; /* Initialize error pointer to null */ | 337 *error = (char *) 0; /* Initialize error pointer to null */ |