From 635fae3ed02eeebc4a4496e40b0c986a887bcc2c Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Sun, 9 Jul 2000 03:26:34 +0000 Subject: [PATCH] Removed search/replace abort call before calling other search/replace function. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@96 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 3 +++ po/nano.pot | 26 +++++++++++++------------- search.c | 2 -- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05690f40..ad4bda80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ Current CVS: from '%s' to '%s%s' to ensure they still work with the new code. Also put in the translation for " (replace)" in the .po's. Hope I didn't step on your toes doing this Jordi. (Chris) + do_search(), do_replace(): + - Removed call to search_abort()/replace_abort() before call to + the opposite function. nano-0.9.12 - 07/07/2000 - all: diff --git a/po/nano.pot b/po/nano.pot index 5d307a0f..2ea8c1a1 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-07-08 19:47-0400\n" +"POT-Creation-Date: 2000-07-08 23:23-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -32,7 +32,7 @@ msgstr "" msgid "Read %d lines" msgstr "" -#: files.c:215 search.c:166 search.c:184 +#: files.c:215 search.c:172 search.c:191 #, c-format msgid "\"%s\" not found" msgstr "" @@ -679,51 +679,51 @@ msgstr "" msgid "Search Cancelled" msgstr "" -#: search.c:180 +#: search.c:187 msgid "Search Wrapped" msgstr "" -#: search.c:235 +#: search.c:241 #, c-format msgid "Replaced %d occurences" msgstr "" -#: search.c:237 +#: search.c:243 msgid "Replaced 1 occurence" msgstr "" -#: search.c:376 search.c:398 search.c:421 +#: search.c:382 search.c:403 search.c:426 msgid "Replace Cancelled" msgstr "" -#: search.c:394 +#: search.c:399 #, c-format msgid "Replace with [%s]" msgstr "" #. last_search is empty -#: search.c:419 +#: search.c:424 msgid "Replace with" msgstr "" -#: search.c:460 +#: search.c:465 msgid "Replace this instance?" msgstr "" #. Ask for it -#: search.c:511 +#: search.c:516 msgid "Enter line number" msgstr "" -#: search.c:513 +#: search.c:518 msgid "Aborted" msgstr "" -#: search.c:533 +#: search.c:538 msgid "Come on, be reasonable" msgstr "" -#: search.c:538 +#: search.c:543 #, c-format msgid "Only %d lines available, skipping to last line" msgstr "" diff --git a/search.c b/search.c index bc13e880..a14cb60c 100644 --- a/search.c +++ b/search.c @@ -223,7 +223,6 @@ int do_search(void) search_abort(); return 0; } else if (i == -2) { - search_abort(); do_replace(); return 0; } else if (i == 1) { @@ -387,7 +386,6 @@ int do_replace(void) do_replace(); return 1; } else if (i == -2) { - replace_abort(); do_search(); return 0; } else if (i == -3) { -- 2.39.5