From 46db638435ec3f9e2d68cc304446c76977015b99 Mon Sep 17 00:00:00 2001
From: Benno Schulenberg <bensberg@justemail.net>
Date: Thu, 31 Dec 2015 19:20:40 +0000
Subject: [PATCH] Chopping a duplicate parameter.
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5519 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 2 ++
src/files.c | 2 +-
src/nano.c | 8 ++++----
src/proto.h | 2 +-
src/search.c | 12 ++++++------
src/text.c | 2 +-
6 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7a224d2c..47f78e0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* src/text.c (do_formatter): Restore the cursor position differently.
* src/search.c (do_gotopos): Delete this now unused function.
* src/search.c (do_gotolinecolumn): Chop an always FALSE parameter.
+ * src/search.c (do_gotolinecolumn): Chop a duplicate parameter --
+ 'allow_update' always has the same value as 'interactive'.
2015-12-30 Benno Schulenberg <bensberg@justemail.net>
* src/nano.c (main), src/files.c (open_buffer): Don't try to position
diff --git a/src/files.c b/src/files.c
index 55d94aa2..de1c050a 100644
--- a/src/files.c
+++ b/src/files.c
@@ -1207,7 +1207,7 @@ void do_insertfile(
!execute &&
#endif
check_poshistory(answer, &savedposline, &savedposcol))
- do_gotolinecolumn(savedposline, savedposcol, FALSE, FALSE, FALSE);
+ do_gotolinecolumn(savedposline, savedposcol, FALSE, FALSE);
} else
#endif /* !DISABLE_MULTIBUFFER && !DISABLE_HISTORIES */
{
diff --git a/src/nano.c b/src/nano.c
index f3543ea0..07607467 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -2628,7 +2628,7 @@ int main(int argc, char **argv)
/* If a position was given on the command line, go there. */
if (iline > 0 || icol > 0) {
- do_gotolinecolumn(iline, icol, FALSE, FALSE, FALSE);
+ do_gotolinecolumn(iline, icol, FALSE, FALSE);
iline = 0;
icol = 0;
}
@@ -2638,7 +2638,7 @@ int main(int argc, char **argv)
/* If edited before, restore the last cursor position. */
if (check_poshistory(argv[i], &savedposline, &savedposcol))
do_gotolinecolumn(savedposline, savedposcol,
- FALSE, FALSE, FALSE);
+ FALSE, FALSE);
}
#endif
}
@@ -2669,13 +2669,13 @@ int main(int argc, char **argv)
/* If a starting position was given on the command line, go there. */
if (startline > 0 || startcol > 0)
- do_gotolinecolumn(startline, startcol, FALSE, FALSE, FALSE);
+ do_gotolinecolumn(startline, startcol, FALSE, FALSE);
#ifndef DISABLE_HISTORIES
else {
ssize_t savedposline, savedposcol;
/* If the file was edited before, restore the last cursor position. */
if (check_poshistory(argv[optind], &savedposline, &savedposcol))
- do_gotolinecolumn(savedposline, savedposcol, FALSE, FALSE, FALSE);
+ do_gotolinecolumn(savedposline, savedposcol, FALSE, FALSE);
}
#endif
diff --git a/src/proto.h b/src/proto.h
index 564f4e3b..fd9e3af6 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -619,7 +619,7 @@ ssize_t do_replace_loop(
void do_replace(void);
void goto_line_posx(ssize_t line, size_t pos_x);
void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
- bool interactive, bool allow_update);
+ bool interactive);
void do_gotolinecolumn_void(void);
#ifndef NANO_TINY
bool find_bracket_match(bool reverse, const char *bracket_set);
diff --git a/src/search.c b/src/search.c
index 8a1d03c8..0556d81e 100644
--- a/src/search.c
+++ b/src/search.c
@@ -236,7 +236,7 @@ int search_init(bool replacing, bool use_answer)
return -2; /* Call the opposite search function. */
} else if (func == do_gotolinecolumn_void) {
do_gotolinecolumn(openfile->current->lineno,
- openfile->placewewant + 1, TRUE, TRUE, TRUE);
+ openfile->placewewant + 1, TRUE, TRUE);
/* Put answer up on the statusbar and
* fall through. */
return 3;
@@ -946,10 +946,10 @@ void goto_line_posx(ssize_t line, size_t pos_x)
}
/* Go to the specified line and column, or ask for them if interactive
- * is TRUE. Update the screen afterwards if allow_update is TRUE.
+ * is TRUE. In the latter case also update the screen afterwards.
* Note that both the line and column number should be one-based. */
void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
- bool interactive, bool allow_update)
+ bool interactive)
{
if (interactive) {
char *ans = mallocstrcpy(NULL, answer);
@@ -1014,8 +1014,8 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
/* Put the top line of the edit window in range of the current line. */
edit_update(CENTER);
- /* If allow_update is TRUE, update the screen. */
- if (allow_update) {
+ /* When in interactive mode, update the screen. */
+ if (interactive) {
edit_refresh();
display_main_list();
}
@@ -1025,7 +1025,7 @@ void do_gotolinecolumn(ssize_t line, ssize_t column, bool use_answer,
void do_gotolinecolumn_void(void)
{
do_gotolinecolumn(openfile->current->lineno,
- openfile->placewewant + 1, FALSE, TRUE, TRUE);
+ openfile->placewewant + 1, FALSE, TRUE);
}
#ifndef NANO_TINY
diff --git a/src/text.c b/src/text.c
index f4a75c9d..ff1a9f63 100644
--- a/src/text.c
+++ b/src/text.c
@@ -3180,7 +3180,7 @@ void do_linter(void)
}
}
#endif /* !NANO_TINY */
- do_gotolinecolumn(curlint->lineno, tmpcol, FALSE, FALSE, FALSE);
+ do_gotolinecolumn(curlint->lineno, tmpcol, FALSE, FALSE);
titlebar(NULL);
edit_refresh();
statusbar(curlint->msg);
--
GitLab