LineageOS/android_external_bash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bash-5.0 patch 12: fix problems moving back beyond start of history

Browse Source
This commit is contained in:
Chet Ramey
2020-02-07 15:16:28 -05:00
parent d894cfd104
commit b0852fb54e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/readline/misc.c
View File

@@ -576,6 +576,7 @@ int
rl_get_previous_history (int count, int key) rl_get_previous_history (int count, int key)
{ {
HIST_ENTRY *old_temp, *temp; HIST_ENTRY *old_temp, *temp;
int had_saved_line;
if (count < 0) if (count < 0)
return (rl_get_next_history (-count, key)); return (rl_get_next_history (-count, key));
@@ -588,6 +589,7 @@ rl_get_previous_history (int count, int key)
_rl_history_saved_point = (rl_point == rl_end) ? -1 : rl_point; _rl_history_saved_point = (rl_point == rl_end) ? -1 : rl_point;
/* If we don't have a line saved, then save this one. */ /* If we don't have a line saved, then save this one. */
had_saved_line = _rl_saved_line_for_history != 0;
rl_maybe_save_line (); rl_maybe_save_line ();
/* If the current line has changed, save the changes. */ /* If the current line has changed, save the changes. */
@@ -611,7 +613,8 @@ rl_get_previous_history (int count, int key)
if (temp == 0) if (temp == 0)
{ {
rl_maybe_unsave_line (); if (had_saved_line == 0)
_rl_free_saved_history_line ();
rl_ding (); rl_ding ();
} }
else else

2
patchlevel.h
View File

@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */ looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 11 #define PATCHLEVEL 12
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */