X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=edit.c;h=643603245b7958cb0198ae44d3ced8e72e949778;hb=733d10d283b596a5adac07f42f15c73431b85a41;hp=ae7643ea95ef12f060fd15003fbc11f22a9521b8;hpb=3990095c4ac65c7f6e10b2fa074f763d048a92eb;p=pkg%2Fabook.git

diff --git a/edit.c b/edit.c
index ae7643e..6436032 100644
--- a/edit.c
+++ b/edit.c
@@ -127,12 +127,12 @@ print_editor_header(int item)
 
 	get_first_email(email, item);
 	
-	if( snprintf(header, EDITW_COLS, "%s <%s>", database[item][NAME],
-				email ) ==  -1 || !*database[item][EMAIL] )
-	if( snprintf(header, EDITW_COLS, "%s", database[item][NAME]) == -1) {
-		free(header);
-		return;
-	}
+	if( *database[item][EMAIL] )
+		snprintf(header, EDITW_COLS, "%s <%s>",
+				database[item][NAME],
+				database[item][EMAIL]);
+	else
+		snprintf(header, EDITW_COLS, "%s", database[item][NAME]);
 
 	len = strlen(header);
 	x = (EDITW_COLS - len) / 2;
@@ -374,16 +374,20 @@ edit_loop(int item)
 			       break;
 		case KEY_RIGHT: tab = tab == MAX_TAB ? 0 : tab + 1;
 				break;
+		case '<':
+		case 'k': if(is_valid_item(item-1)) item--; break;
+		case '>':
+		case 'j': if(is_valid_item(item+1)) item++; break;
 		case 'r': roll_emails(item); break;
 		case '?': display_help(HELP_EDITOR); break;
 		case 'u': edit_undo(item, RESTORE_ITEM); break;
-		case 'm': launch_mutt(item);
-		case 'v': launch_wwwbrowser(item);
+		case 'm': launch_mutt(item); clearok(stdscr, 1); break;
+		case 'v': launch_wwwbrowser(item); clearok(stdscr, 1); break;
 		case 12 : clearok(stdscr, 1); break; /* ^L (refresh screen) */
-		default:  return edit_field(tab, c, item);
+		default:  return edit_field(tab, c, item) ? item : -1;
 	}
 
-	return 1;
+	return item;
 }
 
 void
@@ -397,8 +401,9 @@ edit_item(int item)
 	}
 
 	init_editor();
-	while( edit_loop(item) )
-		;
+
+	while( (item = edit_loop(item)) >= 0 )
+		curitem = item; /* hmm, this is not very clean way to go */
 
 	close_editor();
 }