Mercurial > emacs
comparison src/menu.c @ 109793:b60dcdd855f0
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Sun, 08 Aug 2010 22:52:25 +0000 |
| parents | 8949aad5e992 |
| children | e2f8226efb99 |
comparison
equal
deleted
inserted
replaced
| 109649:1f8f03cfcd2b | 109793:b60dcdd855f0 |
|---|---|
| 660 i += 1; | 660 i += 1; |
| 661 else if (EQ (XVECTOR (menu_items)->contents[i], Qt)) | 661 else if (EQ (XVECTOR (menu_items)->contents[i], Qt)) |
| 662 { | 662 { |
| 663 /* Create a new pane. */ | 663 /* Create a new pane. */ |
| 664 Lisp_Object pane_name, prefix; | 664 Lisp_Object pane_name, prefix; |
| 665 char *pane_string; | 665 const char *pane_string; |
| 666 | 666 |
| 667 panes_seen++; | 667 panes_seen++; |
| 668 | 668 |
| 669 pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME]; | 669 pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME]; |
| 670 prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX]; | 670 prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX]; |