From abd89936607b67e9c70e7c74f1f5cc6997842b83 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Wed, 10 Aug 2005 20:03:58 +0000 Subject: [PATCH] in update_history(), add a check to make sure the parameter we pass to renumber() isn't NULL, and update related comments git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2979 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 8 +++++++- src/files.c | 2 +- src/search.c | 6 ++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e337dc7..ce6e4832 100644 --- a/ChangeLog +++ b/ChangeLog @@ -265,7 +265,13 @@ CVS code - where it's used. (DLR) do_find_bracket() - Add comments and minor cleanups. (DLR) - find_history(), get_history_completion() + find_history() + - Make parameters const where possible. (DLR) + update_history() + - Don't renumber the history list starting after the entry we + found if the entry we found is at the bottom of the list. + (DLR, found by Simon Strandman) + get_history_completion() - Make parameters const where possible. (DLR) - text.c: do_word_count() diff --git a/src/files.c b/src/files.c index 92ebcedc..9c23459f 100644 --- a/src/files.c +++ b/src/files.c @@ -449,7 +449,7 @@ void read_file(FILE *f, const char *filename) if (fileptr == NULL) open_buffer(""); - /* Did we try to insert a file of 0 bytes? */ + /* Did we try to insert a file of zero bytes? */ if (num_lines != 0) { if (openfile->current != NULL) { fileptr->next = openfile->current; diff --git a/src/search.c b/src/search.c index c27feec2..d9548b0d 100644 --- a/src/search.c +++ b/src/search.c @@ -1211,11 +1211,13 @@ void update_history(filestruct **h, const char *s) bar = p->next; unlink_node(foo); delete_node(foo); - renumber(bar); + if (bar != NULL) + renumber(bar); } /* If the history is full, delete the beginning entry to make room - * for the new entry at the end. */ + * for the new entry at the end. We assume that MAX_SEARCH_HISTORY + * is greater than zero. */ if ((*hbot)->lineno == MAX_SEARCH_HISTORY + 1) { filestruct *foo = *hage;