aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-10-27 05:20:20 -04:00
Code

Don't allow command history to wrap around

Browse Source 
This changes the behavior of the command history to avoid wrapping back
to the bottom once the top of the history is reached.
This commit is contained in:
Joseph Bisch 2017-04-06 20:27:39 -04:00
parent 3f69e71804
commit 7c86575b02
No known key found for this signature in database
GPG Key ID: CF08FAC339AB7E8E
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/fe-common/core/command-history.c
View File

@ -113,11 +113,9 @@ const char *command_history_prev(WINDOW_REC *window, const char *text)
pos = history->pos;
if (pos != NULL) {
history->pos = history->pos->prev;
if (history->pos == NULL)
history->over_counter++;
} else if (history->lines == 0) {
history->over_counter++;
/* don't go past the first entry (no wrap around) */
if (history->pos->prev != NULL)
history->pos = history->pos->prev;
} else {
history->pos = g_list_last(history->list);
}
@ -128,7 +126,7 @@ const char *command_history_prev(WINDOW_REC *window, const char *text)
command_history_add(history, text);
}
return history->pos == NULL ? "" : history->pos->data;
return history->pos == NULL ? text : history->pos->data;
}
const char *command_history_next(WINDOW_REC *window, const char *text)
@ -141,10 +139,6 @@ const char *command_history_next(WINDOW_REC *window, const char *text)
if (pos != NULL)
history->pos = history->pos->next;
else if (history->over_counter > 0) {
history->over_counter--;
history->pos = history->list;
}
if (*text != '\0' &&
(pos == NULL || g_strcmp0(pos->data, text) != 0)) {