patch-0.95.1.vikas.macro_function.1

2 files changed, 14 insertions, 13 deletions

diff --git a/curs_lib.c b/curs_lib.c
index 6d8df4bc..de10a986 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -244,23 +244,24 @@ void mutt_show_error (void)
 
 void mutt_endwin (const char *msg)
 {
-
+  if (!option (OPTNOCURSES))
+  {
 #ifdef SLANG_CURSES
-  CLEARLINE (LINES - 1);
-  move (LINES - 1, 0)
+    CLEARLINE (LINES - 1);
+    move (LINES - 1, 0)
 #else
-  move (LINES - 1, COLS - 1);
-  CLEARLINE (LINES - 1);
+      move (LINES - 1, COLS - 1);
+    CLEARLINE (LINES - 1);
 #endif
-
-  attrset (A_NORMAL);
-  mutt_refresh ();
-  endwin ();
-
+    
+    attrset (A_NORMAL);
+    mutt_refresh ();
+    endwin ();
 #ifndef SLANG_CURSES
-  fputc ('\n', stdout);
+    fputc ('\n', stdout);
 #endif
-
+  }
+  
   if (msg)
     puts (msg);
 }
diff --git a/keymap.c b/keymap.c
index 943ce54f..97bdb9c9 100644
--- a/keymap.c
+++ b/keymap.c
@@ -34,7 +34,6 @@ struct mapping_t Menus[] = {
  { "browser",	MENU_FOLDER },
  { "compose",	MENU_COMPOSE },
  { "editor",	MENU_EDITOR },
- { "generic",	MENU_GENERIC },
  { "index",	MENU_MAIN },
  { "pager",	MENU_PAGER },
  { "postpone",	MENU_POST },
@@ -48,6 +47,7 @@ struct mapping_t Menus[] = {
   
 
  { "query",	MENU_QUERY },
+ { "generic",	MENU_GENERIC },
  { NULL,	0 }
 };