nano

commit fa8f7bf0dc786a0215a6ccc80cb14875fce83bd9
parent 6a2273d7819a6b3f1398be577e82b3e6e9b18635
Author: Chris Allegretta <chrisa@asty.org>
Date:   Wed, 12 Jul 2000 02:41:13 +0000

Fixed consecutive search substring replace bug (28)


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

Diffstat:
M
BUGS
 | 
2
+-
M
ChangeLog
 | 
1
+
M
po/nano.pot
 | 
2
+-
M
search.c
 | 
2
+-

4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/BUGS b/BUGS
@@ -41,5 +41,5 @@
 - In search/replace code there is too much refreshing in bottomwin (26)
 - In replace, there is no way to accept the default replace string. (27)
 - In replace with completely adjacent strings, every other search string
-  will be missed (try replace ':' in a string like ':::::::::') (28)
+  will be missed (try replace ':' in a string like ':::::::::') (28) [FIXED]
 
diff --git a/ChangeLog b/ChangeLog
@@ -14,6 +14,7 @@ Current CVS:
   do_search(), do_replace():
 	- Removed call to search_abort()/replace_abort() before call to
 	  the opposite function.
+	- Fixed bug #28.
 - fr.po:
 	- French update by Clement Laforet <clem_laf@wanadoo.fr>.
 
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-07-11 22:00-0400\n"
+"POT-Creation-Date: 2000-07-11 22:41-0400\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"
diff --git a/search.c b/search.c
@@ -479,7 +479,7 @@ int do_replace(void)
 	    current->data = copy;
 
 	    /* Stop bug where we replace a substring of the replacement text */
-	    current_x += strlen(last_replace);
+	    current_x += strlen(last_replace) - 1;
 
 	    edit_refresh();
 	    set_modified();