From 57542019440bc46ff4835bce1cffd7af1ffedc6b Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Tue, 17 May 2005 22:27:15 +0000
Subject: [PATCH] when calling do_gotolinecolymn(), default to the current line
and column if the ones passed in are unspecified or invalid
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2527 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
src/search.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/search.c b/src/search.c
index b6eaa25f..9b907d0b 100644
--- a/src/search.c
+++ b/src/search.c
@@ -255,7 +255,8 @@ int search_init(bool replacing, bool use_answer)
#ifndef NANO_SMALL
search_history.current = search_history.next;
#endif
- do_gotolinecolumn(1, 0, TRUE, TRUE, FALSE);
+ do_gotolinecolumn(current->lineno, placewewant, TRUE,
+ TRUE, FALSE);
/* Put answer up on the statusbar and
* fall through. */
default:
@@ -1010,10 +1011,10 @@ void do_gotolinecolumn(int line, ssize_t column, bool use_answer, bool
}
} else {
if (line < 1)
- line = 1;
+ line = current->lineno;
if (column < 0)
- column = 0;
+ column = placewewant;
}
for (current = fileage; current->next != NULL && line > 1; line--)
@@ -1031,7 +1032,7 @@ void do_gotolinecolumn(int line, ssize_t column, bool use_answer, bool
void do_gotolinecolumn_void(void)
{
- do_gotolinecolumn(1, 1, FALSE, TRUE, FALSE);
+ do_gotolinecolumn(current->lineno, placewewant, FALSE, TRUE, FALSE);
}
#if defined(ENABLE_MULTIBUFFER) || !defined(DISABLE_SPELLER)
--
GitLab