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

Re-added NANO_NULL_KEY case to search_init code 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@244 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Chris Allegretta 2000-10-26 12:49:54 +00:00
parent bd9e7c3c36
commit 69fbef6e76
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,7 +1,8 @@
CVS Code - CVS Code -
- Ran source through indent -kr again. Make everything pretty. - Ran source through indent -kr again. Make everything pretty.
- Added "replace with null" option. ^N in replace. New alias - Added "replace with null" option. ^N in replace. New alias
NANO_NULL_KEY, and code in do_replace to check for it. NANO_NULL_KEY, and code in do_replace to check for it. Readded
NANO_NULL_KEY case to search_init code.
- global.c - global.c
toggle_init() toggle_init()
- Added #ifdef around toggle_regex_msg to get rid of compiler - Added #ifdef around toggle_regex_msg to get rid of compiler

28
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-10-25 21:35-0400\n" "POT-Creation-Date: 2000-10-26 08:48-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:217 search.c:159 search.c:194 #: files.c:217 search.c:161 search.c:196
#, c-format #, c-format
msgid "\"%s\" not found" msgid "\"%s\" not found"
msgstr "" msgstr ""
@ -761,57 +761,57 @@ msgstr ""
msgid "Search Cancelled" msgid "Search Cancelled"
msgstr "" msgstr ""
#: search.c:175 #: search.c:177
msgid "Search Wrapped" msgid "Search Wrapped"
msgstr "" msgstr ""
#: search.c:254 #: search.c:256
#, c-format #, c-format
msgid "Replaced %d occurences" msgid "Replaced %d occurences"
msgstr "" msgstr ""
#: search.c:256 #: search.c:258
msgid "Replaced 1 occurence" msgid "Replaced 1 occurence"
msgstr "" msgstr ""
#: search.c:390 search.c:419 search.c:444 #: search.c:392 search.c:421 search.c:446
msgid "Replace Cancelled" msgid "Replace Cancelled"
msgstr "" msgstr ""
#. They used ^N in the search field, shame on them. #. They used ^N in the search field, shame on them.
#. Any Dungeon fans out there? #. Any Dungeon fans out there?
#: search.c:407 #: search.c:409
msgid "Nothing Happens" msgid "Nothing Happens"
msgstr "" msgstr ""
#: search.c:415 #: search.c:417
#, c-format #, c-format
msgid "Replace with [%s]" msgid "Replace with [%s]"
msgstr "" msgstr ""
#. last_search is empty #. last_search is empty
#: search.c:442 #: search.c:444
msgid "Replace with" msgid "Replace with"
msgstr "" msgstr ""
#: search.c:485 #: search.c:487
msgid "Replace this instance?" msgid "Replace this instance?"
msgstr "" msgstr ""
#. Ask for it #. Ask for it
#: search.c:546 #: search.c:548
msgid "Enter line number" msgid "Enter line number"
msgstr "" msgstr ""
#: search.c:548 #: search.c:550
msgid "Aborted" msgid "Aborted"
msgstr "" msgstr ""
#: search.c:568 #: search.c:570
msgid "Come on, be reasonable" msgid "Come on, be reasonable"
msgstr "" msgstr ""
#: search.c:573 #: search.c:575
#, c-format #, c-format
msgid "Only %d lines available, skipping to last line" msgid "Only %d lines available, skipping to last line"
msgstr "" msgstr ""

4
search.c
View File

@ -121,7 +121,9 @@ int search_init(int replacing)
} else if (i == NANO_FROMSEARCHTOGOTO_KEY) { } else if (i == NANO_FROMSEARCHTOGOTO_KEY) {
do_gotoline_void(); do_gotoline_void();
return -3; return -3;
} else { /* First line key, etc. */ } else if (i == NANO_NULL_KEY) /* They hit ^N! */
strncpy(last_search, "", 132);
else { /* First line key, etc. */
do_early_abort(); do_early_abort();
return -3; return -3;
} }