nano

commit aaabe1f865913ebecb9eac3e9f1b161b2356f2b1
parent ac0e63aa89b6cd324448f293d34f4bab05c49d33
Author: Chris Allegretta <chrisa@asty.org>
Date:   Sun, 19 Nov 2000 18:20:07 +0000

Fix replace abort moves cursor ahead one space


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

Diffstat:
M
ChangeLog
 | 
3
+++
M
po/nano.pot
 | 
28
++++++++++++++--------------
M
search.c
 | 
10
+++++++---

3 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,4 +1,7 @@
 CVS code -
+- search.c:
+  findnextstr()
+	- Set current_x back before aborting (oops!).
 
 nano 0.9.20 - 11/18/2000
 - General
diff --git 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-17 22:07-0500\n"
+"POT-Creation-Date: 2000-11-19 13:19-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"
@@ -751,7 +751,7 @@ msgstr ""
 msgid " (to replace)"
 msgstr ""
 
-#: search.c:136 search.c:318
+#: search.c:136 search.c:322
 msgid "Search Cancelled"
 msgstr ""
 
@@ -760,54 +760,54 @@ msgstr ""
 msgid "\"%s...\" not found"
 msgstr ""
 
-#: search.c:243
+#: search.c:245
 msgid "Search Wrapped"
 msgstr ""
 
-#: search.c:340
+#: search.c:344
 #, c-format
 msgid "Replaced %d occurences"
 msgstr ""
 
-#: search.c:342
+#: search.c:346
 msgid "Replaced 1 occurence"
 msgstr ""
 
-#: search.c:479 search.c:572 search.c:588
+#: search.c:483 search.c:576 search.c:592
 msgid "Replace Cancelled"
 msgstr ""
 
-#: search.c:522
+#: search.c:526
 msgid "Replace this instance?"
 msgstr ""
 
-#: search.c:530
+#: search.c:534
 msgid "Replace failed: unknown subexpression!"
 msgstr ""
 
-#: search.c:613
+#: search.c:617
 #, c-format
 msgid "Replace with [%s]"
 msgstr ""
 
-#: search.c:617 search.c:621
+#: search.c:621 search.c:625
 msgid "Replace with"
 msgstr ""
 
 #. Ask for it
-#: search.c:656
+#: search.c:660
 msgid "Enter line number"
 msgstr ""
 
-#: search.c:658
+#: search.c:662
 msgid "Aborted"
 msgstr ""
 
-#: search.c:678
+#: search.c:682
 msgid "Come on, be reasonable"
 msgstr ""
 
-#: search.c:683
+#: search.c:687
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr ""
diff --git a/search.c b/search.c
@@ -213,7 +213,7 @@ filestruct *findnextstr(int quiet, filestruct * begin, int beginx,
 	search_last_line = 1;
 
     /* Make sure we haven't passed the end of the string */
-    if (strlen(fileptr->data) < current_x)
+    if (strlen(fileptr->data) + 1 < current_x)
 	current_x--;
 
     searchstr = &fileptr->data[current_x];
@@ -223,8 +223,10 @@ filestruct *findnextstr(int quiet, filestruct * begin, int beginx,
 
 	/* finished processing file, get out */
 	if (search_last_line) {
-	    if (!quiet)
+	    if (!quiet) {
 		not_found_msg(needle);
+		current_x--;
+	    }
 	    return NULL;
 	}
 
@@ -258,8 +260,10 @@ filestruct *findnextstr(int quiet, filestruct * begin, int beginx,
 
     /* Ensure we haven't wrap around again! */
     if ((search_last_line) && (current_x >= beginx)) {
-	if (!quiet)
+	if (!quiet) { 
 	    not_found_msg(needle);
+	    current_x--;
+	}
 	return NULL;
     }