From: Chris Allegretta <chrisa@asty.org>
Date: Sun, 5 Nov 2000 22:48:35 +0000 (+0000)
Subject: Okay, now format the matches the right way
X-Git-Tag: v0.9.20~27
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=75864958139969dfd2b12ae8946a7b9abc49b5b2;p=nano.git

Okay, now format the matches the right way


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@270 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---

diff --git a/files.c b/files.c
index 43684e5f..85739e96 100644
--- a/files.c
+++ b/files.c
@@ -672,15 +672,14 @@ int input_tab(char *buf, int place, int lastWasTab)
 			match_matches++;
 		}
 		if (match_matches == num_matches && 
-			(i == num_matches || matches[i][pos] != 0)) {
-
+			(i == num_matches || matches[i] != 0)) {
 		    /* All the matches have the same character at pos+1,
 			so paste it into buf... */
+		    buf = nrealloc(buf, strlen(buf) + 2);
 		    strncpy(buf + pos, matches[0] + pos, 1);
 	 	    newplace++;
 		    pos++;
-		}
-		else {
+		} else {
 		    beep();
 		    break;
 		}
@@ -718,8 +717,13 @@ int input_tab(char *buf, int place, int lastWasTab)
 
 		strcat(foo, "  ");
 
-		col += waddnstr(edit, foo, strlen(foo));
-		if (col > (COLS * .8)  && matches[i + 1] != NULL) {
+		/* now, put the match on the screen */
+		waddnstr(edit, foo, strlen(foo));
+		col += strlen(foo);
+
+		/* And if the next match isn't going to fit on the
+		   line, move to the next one */
+		if (col > (COLS - longestname)  && matches[i + 1] != NULL) {
 		    editline++;
 		    wmove(edit, editline, 0);
 		    col = 0;
diff --git a/po/nano.pot b/po/nano.pot
index 10453bd7..eea67e0f 100644
--- a/po/nano.pot
+++ b/po/nano.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-11-05 16:56-0500\n"
+"POT-Creation-Date: 2000-11-05 17:48-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"