From 69fbef6e764e5ad79de22d0ee3a47cccc569685e Mon Sep 17 00:00:00 2001 From: Chris Allegretta Date: Thu, 26 Oct 2000 12:49:54 +0000 Subject: [PATCH] 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 --- ChangeLog | 3 ++- po/nano.pot | 28 ++++++++++++++-------------- search.c | 4 +++- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6035e63c..25bcbaa3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,8 @@ CVS Code - - Ran source through indent -kr again. Make everything pretty. - 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 toggle_init() - Added #ifdef around toggle_regex_msg to get rid of compiler diff --git a/po/nano.pot b/po/nano.pot index 01a137c5..7cf64d64 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-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" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -32,7 +32,7 @@ msgstr "" msgid "Read %d lines" msgstr "" -#: files.c:217 search.c:159 search.c:194 +#: files.c:217 search.c:161 search.c:196 #, c-format msgid "\"%s\" not found" msgstr "" @@ -761,57 +761,57 @@ msgstr "" msgid "Search Cancelled" msgstr "" -#: search.c:175 +#: search.c:177 msgid "Search Wrapped" msgstr "" -#: search.c:254 +#: search.c:256 #, c-format msgid "Replaced %d occurences" msgstr "" -#: search.c:256 +#: search.c:258 msgid "Replaced 1 occurence" msgstr "" -#: search.c:390 search.c:419 search.c:444 +#: search.c:392 search.c:421 search.c:446 msgid "Replace Cancelled" msgstr "" #. They used ^N in the search field, shame on them. #. Any Dungeon fans out there? -#: search.c:407 +#: search.c:409 msgid "Nothing Happens" msgstr "" -#: search.c:415 +#: search.c:417 #, c-format msgid "Replace with [%s]" msgstr "" #. last_search is empty -#: search.c:442 +#: search.c:444 msgid "Replace with" msgstr "" -#: search.c:485 +#: search.c:487 msgid "Replace this instance?" msgstr "" #. Ask for it -#: search.c:546 +#: search.c:548 msgid "Enter line number" msgstr "" -#: search.c:548 +#: search.c:550 msgid "Aborted" msgstr "" -#: search.c:568 +#: search.c:570 msgid "Come on, be reasonable" msgstr "" -#: search.c:573 +#: search.c:575 #, c-format msgid "Only %d lines available, skipping to last line" msgstr "" diff --git a/search.c b/search.c index 04aefa86..73471768 100644 --- a/search.c +++ b/search.c @@ -121,7 +121,9 @@ int search_init(int replacing) } else if (i == NANO_FROMSEARCHTOGOTO_KEY) { do_gotoline_void(); 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(); return -3; } -- 2.39.5