h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-22 07:31:17 -03:00
Code Issues Packages Projects Releases Wiki Activity

Support for a "pending item" in history.

Browse Source 
Before running a command, we add the command to history, so
that if the command causes us to exit it's still captured in
history. But that command should not be considered part of
history when expanding the history within the command itself.
For example, `echo $history[1]` should be the previously
run command, not `echo $history[1]` itself.

Fixes #2028
This commit is contained in:
ridiculousfish
2015-04-20 02:04:17 -07:00
parent 722fedc8fd
commit c3ef23b10f
4 changed files with 80 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
reader.cpp
View File

@@ -2982,6 +2982,11 @@ static int read_i(void)
event_fire_generic(L"fish_preexec", &argv);
reader_run_command(parser, command);
event_fire_generic(L"fish_postexec", &argv);
/* Allow any pending history items to be returned in the history array. */
if (data->history)
{
data->history->resolve_pending();
}
if (data->end_loop)
{
handle_end_loop();
@@ -3592,7 +3597,7 @@ const wchar_t *reader_readline(int nchars)
const editable_line_t *el = &data->command_line;
if (data->history != NULL && ! el->empty() && el->text.at(0) != L' ')
{
data->history->add_with_file_detection(el->text);
data->history->add_pending_with_file_detection(el->text);
}
finished=1;
update_buff_pos(&data->command_line, data->command_line.size());