ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
master
Chris Allegretta 2000-07-09 03:26:34 +00:00
parent 2a4ef924c8
commit 635fae3ed0
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -9,6 +9,9 @@ Current CVS:
from '%s' to '%s%s' to ensure they still work with the new code. 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 Also put in the translation for " (replace)" in the .po's. Hope
I didn't step on your toes doing this Jordi. (Chris) 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 nano-0.9.12 - 07/07/2000
- all: - all:

26
po/nano.pot
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -32,7 +32,7 @@ msgstr ""
msgid "Read %d lines" msgid "Read %d lines"
msgstr "" msgstr ""
#: files.c:215 search.c:166 search.c:184 #: files.c:215 search.c:172 search.c:191
#, c-format #, c-format
msgid "\"%s\" not found" msgid "\"%s\" not found"
msgstr "" msgstr ""
@ -679,51 +679,51 @@ msgstr ""
msgid "Search Cancelled" msgid "Search Cancelled"
msgstr "" msgstr ""
#: search.c:180 #: search.c:187
msgid "Search Wrapped" msgid "Search Wrapped"
msgstr "" msgstr ""
#: search.c:235 #: search.c:241
#, c-format #, c-format
msgid "Replaced %d occurences" msgid "Replaced %d occurences"
msgstr "" msgstr ""
#: search.c:237 #: search.c:243
msgid "Replaced 1 occurence" msgid "Replaced 1 occurence"
msgstr "" msgstr ""
#: search.c:376 search.c:398 search.c:421 #: search.c:382 search.c:403 search.c:426
msgid "Replace Cancelled" msgid "Replace Cancelled"
msgstr "" msgstr ""
#: search.c:394 #: search.c:399
#, c-format #, c-format
msgid "Replace with [%s]" msgid "Replace with [%s]"
msgstr "" msgstr ""
#. last_search is empty #. last_search is empty
#: search.c:419 #: search.c:424
msgid "Replace with" msgid "Replace with"
msgstr "" msgstr ""
#: search.c:460 #: search.c:465
msgid "Replace this instance?" msgid "Replace this instance?"
msgstr "" msgstr ""
#. Ask for it #. Ask for it
#: search.c:511 #: search.c:516
msgid "Enter line number" msgid "Enter line number"
msgstr "" msgstr ""
#: search.c:513 #: search.c:518
msgid "Aborted" msgid "Aborted"
msgstr "" msgstr ""
#: search.c:533 #: search.c:538
msgid "Come on, be reasonable" msgid "Come on, be reasonable"
msgstr "" msgstr ""
#: search.c:538 #: search.c:543
#, c-format #, c-format
msgid "Only %d lines available, skipping to last line" msgid "Only %d lines available, skipping to last line"
msgstr "" msgstr ""

2
search.c
View File

@ -223,7 +223,6 @@ int do_search(void)
search_abort(); search_abort();
return 0; return 0;
} else if (i == -2) { } else if (i == -2) {
search_abort();
do_replace(); do_replace();
return 0; return 0;
} else if (i == 1) { } else if (i == 1) {
@ -387,7 +386,6 @@ int do_replace(void)
do_replace(); do_replace();
return 1; return 1;
} else if (i == -2) { } else if (i == -2) {
replace_abort();
do_search(); do_search();
return 0; return 0;
} else if (i == -3) { } else if (i == -3) {