The attached patch removes some redundant code related to the macro

function stuff. Since each menu calls km_dokey() to get the 'op'
number to execute, the 'menu' argument to km_dokey() _is_ the
CurrentMenu. Hence, there is no need to explicitly save/restore the
CurrentMenu all over the code. The only places it is being captured
now is just before mutt_enter_comamnd() is called. This is to help
the 'exec' command completion code so that it knows which menu to
try and complete the function name from.
(From: Vikas Agnihotri <VikasA@att.com>)

1 files changed, 1 insertions, 3 deletions

diff --git a/query.c b/query.c
index 0ca596be..44296a2f 100644
--- a/query.c
+++ b/query.c
@@ -240,7 +240,6 @@ static void query_menu (char *buf, size_t buflen, QUERY *results, int retbuf)
   int op;
   char helpstr[SHORT_STRING];
   char title[STRING];
-  int savedmenu = CurrentMenu;
 
   snprintf (title, sizeof (title), _("Query")); /* FIXME */
 
@@ -248,7 +247,7 @@ static void query_menu (char *buf, size_t buflen, QUERY *results, int retbuf)
   menu->make_entry = query_entry;
   menu->search = query_search;
   menu->tag = query_tag;
-  menu->menu = CurrentMenu = MENU_QUERY;
+  menu->menu = MENU_QUERY;
   menu->title = title;
   menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_QUERY, QueryHelp);
 
@@ -464,5 +463,4 @@ static void query_menu (char *buf, size_t buflen, QUERY *results, int retbuf)
   }
 
   mutt_menuDestroy (&menu);
-  CurrentMenu = savedmenu;
 }