diff --git a/ChangeLog b/ChangeLog index e42bf80eaedae859fa7ed3d3af1b6aa4160e779d..4906c213102fc50c9faf4ae8e73dc7ceaae3a903 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ 2015-12-31 Benno Schulenberg <bensberg@justemail.net> * src/text.c (do_formatter): Restore the cursor position differently. + * src/search.c (do_gotopos): Delete this now unused function. 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/proto.h b/src/proto.h index 566790d4d586b9a8084fe33bcae2472a819179d5..53643260e192860494087c583227ec3eb15393f1 100644 --- a/src/proto.h +++ b/src/proto.h @@ -617,14 +617,10 @@ ssize_t do_replace_loop( bool *canceled, const filestruct *real_current, size_t *real_current_x, const char *needle); 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 save_pos, bool allow_update); void do_gotolinecolumn_void(void); -#ifndef DISABLE_SPELLER -void do_gotopos(ssize_t pos_line, size_t pos_x, ssize_t pos_y, size_t - pos_pww); -#endif -void goto_line_posx(ssize_t line, size_t pos_x); #ifndef NANO_TINY bool find_bracket_match(bool reverse, const char *bracket_set); void do_find_bracket(void); diff --git a/src/search.c b/src/search.c index f4769cdef0ceb8293a462208bb9350e3d0faecdf..fb72a82394854eb8f06d1688d00e96706dd1890b 100644 --- a/src/search.c +++ b/src/search.c @@ -1032,24 +1032,6 @@ void do_gotolinecolumn_void(void) openfile->placewewant + 1, FALSE, TRUE, FALSE, TRUE); } -#ifndef DISABLE_SPELLER -/* Go to the line with the number specified in pos_line, the - * x-coordinate specified in pos_x, the y-coordinate specified in pos_y, - * and the place we want specified in pos_pww. */ -void do_gotopos(ssize_t pos_line, size_t pos_x, ssize_t pos_y, size_t - pos_pww) -{ - /* Since do_gotolinecolumn() resets the x-coordinate but not the - * y-coordinate, set the coordinates up this way. */ - openfile->current_y = pos_y; - do_gotolinecolumn(pos_line, pos_x + 1, FALSE, FALSE, TRUE, TRUE); - - /* Set the rest of the coordinates up. */ - openfile->placewewant = pos_pww; - update_line(openfile->current, pos_x); -} -#endif - #ifndef NANO_TINY /* Search for a match to one of the two characters in bracket_set. If * reverse is TRUE, search backwards for the leftmost bracket.