Bug #46, discovered and fixed

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@245 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/BUGS b/BUGS
index 2bcd457b02b6f2583f474e00f4a870f028cb8bf7..63f6ac844cd2a6f83241cdbcd159bc0e09ec18c2 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -65,6 +65,8 @@
 - The keypad does not work when nano runs in the Gnome terminal (43). [FIXED]
 - When reading in a file, if the file is a directory the contents of the
   file being edited are blown away (discovered by  Chris Pimlot) (44). [FIXED]
+- In replace, hitting the Goto line shortcut key does nothing after a
+  search string is entered (discovered by Rocco Corsi) (46) [FIXED].
 
 ** Open BUGS **
 

diff --git a/ChangeLog b/ChangeLog
index 25bcbaa3d2ba73a86e8f360394c4279c3d1f3328..ff2e3508ba71a70d9bb0f8f92ef0057e0c04dd43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@ CVS Code -
   replace_abort()
        - Add reset of placewewant, stops cursor from jumping when moving
          cursor after a replace.
+  do_replace()
+       - Added code for Gotoline key after entering the search term.
+         Fixes bug #46.
 - winio.c
   nanogetstr()
        - Added check for 343 in while loop to get rid of getting "locked"

diff --git a/po/nano.pot b/po/nano.pot
index 7cf64d6419bbe038cb9015a2001444210c47a85a..ca65d813a214cf1a5b5e328eb6a2f315575d0782 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-10-26 08:48-0400\n"
+"POT-Creation-Date: 2000-10-27 00:34-0400\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"
@@ -774,7 +774,7 @@ msgstr ""
 msgid "Replaced 1 occurence"
 msgstr ""
 
-#: search.c:392 search.c:421 search.c:446
+#: search.c:392 search.c:421 search.c:449
 msgid "Replace Cancelled"
 msgstr ""
 
@@ -790,28 +790,28 @@ msgid "Replace with [%s]"
 msgstr ""
 
 #. last_search is empty
-#: search.c:444
+#: search.c:447
 msgid "Replace with"
 msgstr ""
 
-#: search.c:487
+#: search.c:493
 msgid "Replace this instance?"
 msgstr ""
 
 #. Ask for it
-#: search.c:548
+#: search.c:554
 msgid "Enter line number"
 msgstr ""
 
-#: search.c:550
+#: search.c:556
 msgid "Aborted"
 msgstr ""
 
-#: search.c:570
+#: search.c:576
 msgid "Come on, be reasonable"
 msgstr ""
 
-#: search.c:575
+#: search.c:581
 #, c-format
 msgid "Only %d lines available, skipping to last line"
 msgstr ""

diff --git a/search.c b/search.c
index 73471768dc032e10b6f8f09fb82d349066bbcea4..88dc5f085b0e83499bed402a750e81e1cb0c42dc 100644 (file)
--- a/search.c
+++ b/search.c
@@ -433,6 +433,9 @@ int do_replace(void)
 
            do_replace();
            return 0;
+       } else if (i == NANO_FROMSEARCHTOGOTO_KEY) {    /* oops... */
+           do_gotoline_void();
+           return 0;
        } else if (i != -2) {   /* First page, last page, for example could get here */
 
            do_early_abort();
@@ -456,6 +459,9 @@ int do_replace(void)
 
            do_replace();
            return -1;
+       } else if (i == NANO_FROMSEARCHTOGOTO_KEY) {    /* oops... */
+           do_gotoline_void();
+           return 0;
        } else if (i == NANO_NULL_KEY)
            strcpy(last_replace, "");
        else {                  /* First line key, etc. */