launch_mutt() update

[pkg/abook.git] / ui.c

diff --git a/ui.c b/ui.c
index 7c60b0681c11f3b370435f06d241a896e62036e7..c706963f86e550e26adaf18edcecb7e08257742c 100644 (file)
--- a/ui.c
+++ b/ui.c
@@ -37,13 +37,6 @@
 #      include <sys/ioctl.h>
 #endif
 
-#ifdef USE_ASCII_ONLY
-#      define UI_HLINE_CHAR            '-'
-#else
-#      define UI_HLINE_CHAR            ACS_HLINE
-#endif
-
-
 /*
  * external variables
  */
@@ -472,7 +465,8 @@ get_commands()
                        case 'Z': move_curitem(MOVE_ITEM_DOWN);
                                break;
 
-                       case 'm': launch_mutt(list_current_item());
+                       case 'm': launch_mutt(selected_items() ?
+                                                 -1 : list_current_item());
                                  refresh_screen();
                                  break;
 
@@ -513,6 +507,7 @@ ui_find(int next)
 {
        int item;
        static char findstr[81];
+       int search_fields[] = {NAME, EMAIL, NICK, -1};
 
        if(next) {
                if( !*findstr )
@@ -524,7 +519,8 @@ ui_find(int next)
                clear_statusline();
        }
 
-       if( (item = find_item(findstr, next ? curitem+1 : curitem)) >= 0 ) {
+       if( (item = find_item(findstr, next ? curitem+1 : curitem,
+                                       search_fields )) >= 0 ) {
                curitem = item;
                refresh_list();
        }