From: Chris Allegretta Date: Tue, 21 Nov 2000 12:52:55 +0000 (+0000) Subject: Actually use last_replace if user just hits enter in do_replace with PICO_MODE on X-Git-Tag: v0.9.21~3 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=c793c43e951ed55a5d4920b7307c2ca556941166;p=nano.git Actually use last_replace if user just hits enter in do_replace with PICO_MODE on git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@307 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- diff --git a/ChangeLog b/ChangeLog index ad24649d..05ad5690 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,10 +11,12 @@ CVS code - search_init() - Silly typo in our "one simple call" of statusq. Stopped previous search string from being displayed. + do_replace() + - Copy back the previous value of last_replace into answer if + using PICO_MODE and answer == "" - nano.1, nano.1.html - Updated man page for new -p definition. - nano 0.9.20 - 11/18/2000 - General - Ran source through indent -kr again. Make everything pretty. diff --git a/po/de.gmo b/po/de.gmo index e75e97b7..1a58b9c9 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index ac29492e..5eccae9d 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 0.9.17\n" -"POT-Creation-Date: 2000-11-17 22:07-0500\n" +"POT-Creation-Date: 2000-11-21 01:23-0500\n" "PO-Revision-Date: 2000-09-09 11:55+0200\n" "Last-Translator: Florian König \n" "Language-Team: German \n" @@ -733,27 +733,27 @@ msgstr "Hauptprogramm: unteres Fenster\n" msgid "Main: open file\n" msgstr "Hauptprogramm: Datei öffnen\n" -#: nano.c:2150 +#: nano.c:2153 #, fuzzy, c-format msgid "I got Alt-O-%c! (%d)\n" msgstr "Erhielt Alt-[-%c! (%d)\n" -#: nano.c:2172 +#: nano.c:2175 #, fuzzy, c-format msgid "I got Alt-[-1-%c! (%d)\n" msgstr "Erhielt Alt-[-%c! (%d)\n" -#: nano.c:2205 +#: nano.c:2208 #, fuzzy, c-format msgid "I got Alt-[-2-%c! (%d)\n" msgstr "Erhielt Alt-[-%c! (%d)\n" -#: nano.c:2253 +#: nano.c:2256 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "Erhielt Alt-[-%c! (%d)\n" -#: nano.c:2279 +#: nano.c:2282 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "Erhielt Alt-%c! (%d)\n" diff --git a/po/es.gmo b/po/es.gmo index 28f0dad9..da92b178 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index 3bbadf2f..e4021c70 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.9.19+CVS\n" -"POT-Creation-Date: 2000-11-17 22:07-0500\n" +"POT-Creation-Date: 2000-11-21 01:23-0500\n" "PO-Revision-Date: 2000-11-01 17:55+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Spanish \n" @@ -727,27 +727,27 @@ msgstr "Main: ventana inferior\n" msgid "Main: open file\n" msgstr "Main: abrir fichero\n" -#: nano.c:2150 +#: nano.c:2153 #, c-format msgid "I got Alt-O-%c! (%d)\n" msgstr "Pillé Alt-O-%c! (%d)\n" -#: nano.c:2172 +#: nano.c:2175 #, c-format msgid "I got Alt-[-1-%c! (%d)\n" msgstr "Pillé Alt-[-1-%c! (%d)\n" -#: nano.c:2205 +#: nano.c:2208 #, c-format msgid "I got Alt-[-2-%c! (%d)\n" msgstr "Pillé Alt-[-2-%c! (%d)\n" -#: nano.c:2253 +#: nano.c:2256 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "Pillé Alt-[-%c! (%d)\n" -#: nano.c:2279 +#: nano.c:2282 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "Pillé Alt-%c! (%d)\n" diff --git a/po/fi.gmo b/po/fi.gmo index bca002f7..7543b593 100644 Binary files a/po/fi.gmo and b/po/fi.gmo differ diff --git a/po/fi.po b/po/fi.po index 7bceffa9..c817653d 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: nano 0.9.11\n" -"POT-Creation-Date: 2000-11-17 22:07-0500\n" +"POT-Creation-Date: 2000-11-21 01:23-0500\n" "PO-Revision-Date: 2000-06-21 23:08+03:00\n" "Last-Translator: Pauli Virtanen \n" "Language-Team: Finnish \n" @@ -729,27 +729,27 @@ msgstr "P msgid "Main: open file\n" msgstr "Päätila: avaa tiedosto\n" -#: nano.c:2150 +#: nano.c:2153 #, fuzzy, c-format msgid "I got Alt-O-%c! (%d)\n" msgstr "Vastaanotettu Alt-[-%c! (%d)\n" -#: nano.c:2172 +#: nano.c:2175 #, fuzzy, c-format msgid "I got Alt-[-1-%c! (%d)\n" msgstr "Vastaanotettu Alt-[-%c! (%d)\n" -#: nano.c:2205 +#: nano.c:2208 #, fuzzy, c-format msgid "I got Alt-[-2-%c! (%d)\n" msgstr "Vastaanotettu Alt-[-%c! (%d)\n" -#: nano.c:2253 +#: nano.c:2256 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "Vastaanotettu Alt-[-%c! (%d)\n" -#: nano.c:2279 +#: nano.c:2282 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "Vastaanotettu Alt-%c! (%d)\n" diff --git a/po/fr.po b/po/fr.po index 5d52b1cc..1902bbd5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.8.9\n" -"POT-Creation-Date: 2000-11-17 22:07-0500\n" +"POT-Creation-Date: 2000-11-21 01:23-0500\n" "PO-Revision-Date: 2000-07-09 01:32+0100\n" "Last-Translator: Clement Laforet \n" "Language-Team: French \n" @@ -749,27 +749,27 @@ msgstr "Main: fen msgid "Main: open file\n" msgstr "Main: ouvrir fichier\n" -#: nano.c:2150 +#: nano.c:2153 #, fuzzy, c-format msgid "I got Alt-O-%c! (%d)\n" msgstr "J'ai reçu Alt-[-%c! (%d)\n" -#: nano.c:2172 +#: nano.c:2175 #, fuzzy, c-format msgid "I got Alt-[-1-%c! (%d)\n" msgstr "J'ai reçu Alt-[-%c! (%d)\n" -#: nano.c:2205 +#: nano.c:2208 #, fuzzy, c-format msgid "I got Alt-[-2-%c! (%d)\n" msgstr "J'ai reçu Alt-[-%c! (%d)\n" -#: nano.c:2253 +#: nano.c:2256 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "J'ai reçu Alt-[-%c! (%d)\n" -#: nano.c:2279 +#: nano.c:2282 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "J'ai reçu Alt-%c! (%d)\n" diff --git a/po/id.gmo b/po/id.gmo index cfce5082..6cb9c5aa 100644 Binary files a/po/id.gmo and b/po/id.gmo differ diff --git a/po/id.po b/po/id.po index d73b239f..9cf002b5 100644 --- a/po/id.po +++ b/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: nano-0.9.10\n" -"POT-Creation-Date: 2000-11-17 22:07-0500\n" +"POT-Creation-Date: 2000-11-21 01:23-0500\n" "PO-Revision-Date: 2000-06-08 20:56+07:00\n" "Last-Translator: Tedi Heriyanto \n" "Language-Team: Indonesian \n" @@ -728,27 +728,27 @@ msgstr "Main: jendela bawah\n" msgid "Main: open file\n" msgstr "Main: membuka file\n" -#: nano.c:2150 +#: nano.c:2153 #, fuzzy, c-format msgid "I got Alt-O-%c! (%d)\n" msgstr "Saya mendapat Alt-%c! (%d)\n" -#: nano.c:2172 +#: nano.c:2175 #, fuzzy, c-format msgid "I got Alt-[-1-%c! (%d)\n" msgstr "Saya mendapat Alt-%c! (%d)\n" -#: nano.c:2205 +#: nano.c:2208 #, fuzzy, c-format msgid "I got Alt-[-2-%c! (%d)\n" msgstr "Saya mendapat Alt-%c! (%d)\n" -#: nano.c:2253 +#: nano.c:2256 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "Saya mendapat Alt-%c! (%d)\n" -#: nano.c:2279 +#: nano.c:2282 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "Saya mendapat Alt-%c! (%d)\n" diff --git a/po/it.gmo b/po/it.gmo index a16cc8a9..3b38e2ca 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index c58aa6f5..18d31319 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.8.7\n" -"POT-Creation-Date: 2000-11-17 22:07-0500\n" +"POT-Creation-Date: 2000-11-21 01:23-0500\n" "PO-Revision-Date: 2000-03-03 04:57+0100\n" "Last-Translator: Daniele Medri \n" "MIME-Version: 1.0\n" @@ -715,27 +715,27 @@ msgstr "Main: finestra inferiore\n" msgid "Main: open file\n" msgstr "Main: apri file\n" -#: nano.c:2150 +#: nano.c:2153 #, fuzzy, c-format msgid "I got Alt-O-%c! (%d)\n" msgstr "Premuto Alt-[-%c! (%d)\n" -#: nano.c:2172 +#: nano.c:2175 #, fuzzy, c-format msgid "I got Alt-[-1-%c! (%d)\n" msgstr "Premuto Alt-[-%c! (%d)\n" -#: nano.c:2205 +#: nano.c:2208 #, fuzzy, c-format msgid "I got Alt-[-2-%c! (%d)\n" msgstr "Premuto Alt-[-%c! (%d)\n" -#: nano.c:2253 +#: nano.c:2256 #, c-format msgid "I got Alt-[-%c! (%d)\n" msgstr "Premuto Alt-[-%c! (%d)\n" -#: nano.c:2279 +#: nano.c:2282 #, c-format msgid "I got Alt-%c! (%d)\n" msgstr "Premuto Alt-%c! (%d)\n" diff --git a/po/nano.pot b/po/nano.pot index cbd61529..ee0fc0f0 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-11-21 01:19-0500\n" +"POT-Creation-Date: 2000-11-21 07:49-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -773,41 +773,41 @@ msgstr "" msgid "Replaced 1 occurence" msgstr "" -#: search.c:479 search.c:572 search.c:588 +#: search.c:479 search.c:575 search.c:591 msgid "Replace Cancelled" msgstr "" -#: search.c:522 +#: search.c:525 msgid "Replace this instance?" msgstr "" -#: search.c:530 +#: search.c:533 msgid "Replace failed: unknown subexpression!" msgstr "" -#: search.c:613 +#: search.c:616 #, c-format msgid "Replace with [%s]" msgstr "" -#: search.c:617 search.c:621 +#: search.c:620 search.c:624 msgid "Replace with" msgstr "" #. Ask for it -#: search.c:656 +#: search.c:659 msgid "Enter line number" msgstr "" -#: search.c:658 +#: search.c:661 msgid "Aborted" msgstr "" -#: search.c:678 +#: search.c:681 msgid "Come on, be reasonable" msgstr "" -#: search.c:683 +#: search.c:686 #, c-format msgid "Only %d lines available, skipping to last line" msgstr "" diff --git a/search.c b/search.c index b6b3c73b..87a2f896 100644 --- a/search.c +++ b/search.c @@ -490,6 +490,9 @@ int do_replace_loop(char *prevanswer, filestruct *begin, int *beginx, } } + if (ISSET(PICO_MODE) && !strcmp(answer, "")) + answer = mallocstrcpy(answer, last_replace); + last_replace = mallocstrcpy(last_replace, answer); while (1) {