From: Chris Allegretta <chrisa@asty.org>
Date: Fri, 27 Oct 2000 04:36:01 +0000 (+0000)
Subject: Bug #46, discovered and fixed
X-Git-Tag: v0.9.20~52
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=810632d6665dc5b45a564a3c7622fedf1f00f75e;p=nano.git

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 2bcd457b..63f6ac84 100644
--- 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 25bcbaa3..ff2e3508 100644
--- 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 7cf64d64..ca65d813 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-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 73471768..88dc5f08 100644
--- 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. */