apply multiple patches on w3m-dev(-en) ML since Jun 2005 to Jan 2006.

This commit is contained in:
Dai Sato
2006-04-05 14:18:53 +00:00
parent 77d7685295
commit bc7f9c9026
33 changed files with 1000 additions and 86 deletions

20
menu.c
View File

@@ -1,4 +1,4 @@
/* $Id: menu.c,v 1.43 2004/08/02 15:40:50 ukai Exp $ */
/* $Id: menu.c,v 1.44 2006/04/05 14:18:54 inu Exp $ */
/*
* w3m menu.c
*/
@@ -590,7 +590,6 @@ action_menu(Menu *menu)
*item.variable = item.value;
if (item.type & MENU_FUNC) {
CurrentKey = -1;
CurrentKeyData = NULL;
CurrentCmdData = item.data;
(*item.func) ();
CurrentCmdData = NULL;
@@ -1738,6 +1737,23 @@ initMenu(void)
}
}
DEFUN(interpretAsMenu, INTERPRET_AS_MENU, "Interpret current document as menu-definition")
{
FILE *mf;
MenuList *list;
if ((mf = fopen(Currentbuf->sourcefile, "r")) != NULL) {
interpret_menu(mf);
fclose(mf);
for (list = w3mMenuList; list->id != NULL; list++) {
if (list->item == NULL)
continue;
new_menu(list->menu, list->item);
}
}
}
int
setMenuItem(MenuItem *item, char *type, char *line)
{