Merge branch 'fix/issue-1742-empty-completions' of git://github.com/dtzWill/nix

This commit is contained in:
Shea Levy 2017-12-20 13:18:36 -05:00
commit 62e214fa6f
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27

View file

@ -2587,13 +2587,6 @@ int InputBuffer::getInputLine(PromptBase& pi) {
// ctrl-I/tab, command completion, needs to be before switch statement // ctrl-I/tab, command completion, needs to be before switch statement
if (c == ctrlChar('I') && completionCallback) { if (c == ctrlChar('I') && completionCallback) {
if (pos == 0) // SERVER-4967 -- in earlier versions, you could paste
// previous output
continue; // back into the shell ... this output may have leading
// tabs.
// This hack (i.e. what the old code did) prevents command completion
// on an empty line but lets users paste text with leading tabs.
killRing.lastAction = KillRing::actionOther; killRing.lastAction = KillRing::actionOther;
historyRecallMostRecent = false; historyRecallMostRecent = false;