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 ad24649d91c156f28e4aa88f57acabde86c3c141..05ad5690d52efceb0308196474cf4d6e542bdba4 100644 (file)
--- 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 e75e97b7ce69ccc94d3b8ef8eb22f1f94a92e0f8..1a58b9c9d7f950705082d7dde046e64f33d0946b 100644 (file)
Binary files a/po/de.gmo and b/po/de.gmo differ

diff --git a/po/de.po b/po/de.po
index ac29492e6859649b35a4fbc9d983eba209c171ab..5eccae9d05ba3e077e1466e42d8f71f78176d6bd 100644 (file)
--- 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 <floki@bigfoot.com>\n"
 "Language-Team: German <floki@bigfoot.com>\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 28f0dad91286ebd0e502f4c839730a1e1479b217..da92b1783afd251327fbc14e3ea799a2971f1ae6 100644 (file)
Binary files a/po/es.gmo and b/po/es.gmo differ

diff --git a/po/es.po b/po/es.po
index 3bbadf2fa1b61c5e134d3556e339791ec3c35116..e4021c701617e0202d389d08f72db12ef7f9e22a 100644 (file)
--- 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 <jordi@sindominio.net>\n"
 "Language-Team: Spanish <es@li.org>\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 bca002f70b6788133714785bea13d23bee41fcc5..7543b593095f60ae21dfc74ccf044e3261d2faf9 100644 (file)
Binary files a/po/fi.gmo and b/po/fi.gmo differ

diff --git a/po/fi.po b/po/fi.po
index 7bceffa9aa2c86a4b3b0a8b407cf964e0d96624a..c817653d3fd68f61dc53216903d013c9e93432d5 100644 (file)
--- 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 <pauli.virtanen@saunalahti.fi>\n"
 "Language-Team: Finnish <fi@li.org>\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 5d52b1cc7c3f5a0f502345d91479f998ef4595a4..1902bbd56bc729712e7f3bca415bd66ba2aa6f40 100644 (file)
--- 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 <sheep.killer@free.fr>\n"
 "Language-Team: French <LL@li.org>\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 cfce50823f670130d1edab6a057e60c89e277657..6cb9c5aa791eb114ad8406e49da1c3fca7f219ec 100644 (file)
Binary files a/po/id.gmo and b/po/id.gmo differ

diff --git a/po/id.po b/po/id.po
index d73b239f6787d1d02b7f0d8b26f10460dab52fec..9cf002b5b8be11c200591de16238be130d007c98 100644 (file)
--- 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 <tedi-h@usa.net>\n"
 "Language-Team: Indonesian <id@li.org>\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 a16cc8a921791f571bd1ab6a9aeaaeb980c87381..3b38e2cae2d61caf51eba66fa3b9649a6567c036 100644 (file)
Binary files a/po/it.gmo and b/po/it.gmo differ

diff --git a/po/it.po b/po/it.po
index c58aa6f5c0f41ad1d966154882316a06633357b1..18d313195258d4886f5935cc4661a452b26f2f34 100644 (file)
--- 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 <madrid@linux.it>\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 cbd61529dc5d0366ecb88fc2348608a30f6fa479..ee0fc0f01645744180e125cec1a4f448986f5948 100644 (file)
--- 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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 b6b3c73bea19395db9ad85cb5d65363dc4b4d1d7..87a2f89659a5e416c0d159a4567d8322df7f9c99 100644 (file)
--- 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) {