Mercurial > emacs
comparison src/xmenu.c @ 83632:cc587bfd19ca
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 781-792)
- Update from CVS
- Merge from gnus--rel--5.10
- Merge from emacs--rel--22
* emacs--rel--22 (patch 33-41)
* gnus--rel--5.10 (patch 226-228)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-21
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 11 Jun 2007 01:00:07 +0000 |
parents | 41aaac7180d5 13e433477b6c |
children | 9c01792a3ce8 |
comparison
equal
deleted
inserted
replaced
83631:7d63b897231b | 83632:cc587bfd19ca |
---|---|
323 menu_items_allocated = (VECTORP (menu_items) ? ASIZE (menu_items) : 0); | 323 menu_items_allocated = (VECTORP (menu_items) ? ASIZE (menu_items) : 0); |
324 saved = XCDR (saved); | 324 saved = XCDR (saved); |
325 menu_items_used = XINT (XCAR (saved)); | 325 menu_items_used = XINT (XCAR (saved)); |
326 saved = XCDR (saved); | 326 saved = XCDR (saved); |
327 menu_items_n_panes = XINT (XCAR (saved)); | 327 menu_items_n_panes = XINT (XCAR (saved)); |
328 saved = XCDR (saved); | 328 saved = XCDR (saved); |
329 menu_items_submenu_depth = XINT (XCAR (saved)); | 329 menu_items_submenu_depth = XINT (XCAR (saved)); |
330 return Qnil; | 330 return Qnil; |
331 } | 331 } |
332 | 332 |
333 /* Push the whole state of menu_items processing onto the specpdl. | 333 /* Push the whole state of menu_items processing onto the specpdl. |
3468 first_item = XVECTOR (menu_items)->contents; | 3468 first_item = XVECTOR (menu_items)->contents; |
3469 if (EQ (first_item[0], Qt)) | 3469 if (EQ (first_item[0], Qt)) |
3470 pane_name = first_item[MENU_ITEMS_PANE_NAME]; | 3470 pane_name = first_item[MENU_ITEMS_PANE_NAME]; |
3471 else if (EQ (first_item[0], Qquote)) | 3471 else if (EQ (first_item[0], Qquote)) |
3472 /* This shouldn't happen, see xmenu_show. */ | 3472 /* This shouldn't happen, see xmenu_show. */ |
3473 pane_name = empty_string; | 3473 pane_name = empty_unibyte_string; |
3474 else | 3474 else |
3475 pane_name = first_item[MENU_ITEMS_ITEM_NAME]; | 3475 pane_name = first_item[MENU_ITEMS_ITEM_NAME]; |
3476 | 3476 |
3477 /* (menu-item MENU-NAME PANE-NUMBER) */ | 3477 /* (menu-item MENU-NAME PANE-NUMBER) */ |
3478 menu_object = Fcons (Qmenu_item, | 3478 menu_object = Fcons (Qmenu_item, |