procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

2002-10-06 Andrew Choi <akochoi@shaw.ca>

Browse source 
* macmenu.c (mac_menu_show): Add j to count menu items; match
        menu_item_selection to it to find selected item.
This commit is contained in:
Andrew Choi 2002-10-07 04:00:07 +00:00
parent 496c17d61b
commit 95fb757742
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2002-10-06 Andrew Choi <akochoi@shaw.ca>
* macmenu.c (mac_menu_show): Add j to count menu items; match
menu_item_selection to it to find selected item.
2002-10-06 Jan D. <jan.h.d@swipnet.se>
* xterm.c (XTread_socket): Fix from 2002-10-03 didn't cover all

5
src/macmenu.c
View file

@ -1839,6 +1839,7 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
if (menu_item_selection != 0)
{
Lisp_Object prefix, entry;
int j = 1;
prefix = entry = Qnil;
i = 0;
@ -1860,6 +1861,7 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
prefix
= XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX];
i += MENU_ITEMS_PANE_LENGTH;
j += 2;
}
/* Ignore a nil in the item list.
It's meaningful only for dialog boxes. */
@ -1869,7 +1871,7 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
{
entry
= XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_VALUE];
if (menu_item_selection == i)
if (menu_item_selection == j)
{
if (keymaps != 0)
{
@ -1885,6 +1887,7 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
return entry;
}
i += MENU_ITEMS_ITEM_LENGTH;
j++;
}
}
}