X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=ui.c;h=b4152699b560df0e02f664133c8ccf3520bd45f0;hb=236cce04895dd0443012be918d7927e50bfb6aac;hp=6917f77863768a80180909797f6f6d5dcbb05f5c;hpb=498e95b4f04e4377a63865bde70361f4be570276;p=pkg%2Fabook.git

diff --git a/ui.c b/ui.c
index 6917f77..b415269 100644
--- a/ui.c
+++ b/ui.c
@@ -144,8 +144,8 @@ init_ui()
 	if( LINES < MIN_LINES || COLS < MIN_COLS ) {
 		clear(); refresh(); endwin();
 		fprintf(stderr, _("Your terminal size is %dx%d\n"), COLS, LINES);
-		fprintf(stderr, _("Terminal is too small. Minium terminal size "
-				"for abook is "
+		fprintf(stderr, _("Terminal is too small. Minimum terminal "
+				"size for abook is "
 				"%dx%d\n"), MIN_COLS, MIN_LINES);
 		return 1;
 	}
@@ -237,7 +237,7 @@ statusline_addstr(const char *str)
 static void
 statusline_addhlstr(const char *str)
 {
-#if defined(A_BOLD) && defined(A_NORMAL)
+#if defined(A_BOLD) && defined(A_NORMAL) && defined(A_DIM)
 	const char *p = str, *start = str;
 	char *tmp;
 	int pos = 0;
@@ -245,7 +245,7 @@ statusline_addhlstr(const char *str)
 	while(1) {
 		if(!*p || strchr("<>", *p)) {
 			if(p - start > 0) {
-				wattrset(bottom, (*p == '>') ? A_UNDERLINE : A_NORMAL);
+				wattrset(bottom, (*p == '>') ? A_BOLD : A_NORMAL);
 				tmp = xstrndup(start, p - start);
 				mvwaddstr(bottom, 1, pos, tmp);
 				free(tmp);
@@ -253,11 +253,10 @@ statusline_addhlstr(const char *str)
 			}
 			if(*p) {
 				start = p + 1;
-#if 0
+
 				/* show tag markers */
 				wattrset(bottom, A_DIM);
 				mvwaddch(bottom, 1, pos++, *p);
-#endif
 			}
 		}
 
@@ -599,10 +598,18 @@ ui_print_number_of_items()
 void
 ui_read_database()
 {
-	if(items > 0)
-		if(!statusline_ask_boolean(_("Your current data will be lost - "
-				"Press 'y' to continue"), FALSE))
+	char *msg;
+
+	if(items > 0) {
+		msg = mkstr(_("Your current data will be lost - "
+				"Press '%c' to continue"),
+				*(S_("keybinding for yes|y")));
+		if(!statusline_ask_boolean(msg, FALSE)) {
+			free(msg);
 			return;
+		}
+		free(msg);
+	}
 
 	load_database(datafile);
 	refresh_list();