Compare commits

..

No commits in common. "0ebd8d9035083e7a290a620af8ba444f0ac0b006" and "34ae8ade7b5cbba643523910994006ab874cef81" have entirely different histories.

2 changed files with 14 additions and 32 deletions

View File

@ -39,20 +39,18 @@ const (
// Escape sequences // Escape sequences
var ( var (
seqUp = string([]byte{27, 91, 65}) seqUp = string([]byte{27, 91, 65})
seqDown = string([]byte{27, 91, 66}) seqDown = string([]byte{27, 91, 66})
seqForwards = string([]byte{27, 91, 67}) seqForwards = string([]byte{27, 91, 67})
seqBackwards = string([]byte{27, 91, 68}) seqBackwards = string([]byte{27, 91, 68})
seqHome = string([]byte{27, 91, 72}) seqHome = string([]byte{27, 91, 72})
seqHomeSc = string([]byte{27, 91, 49, 126}) seqHomeSc = string([]byte{27, 91, 49, 126})
seqEnd = string([]byte{27, 91, 70}) seqEnd = string([]byte{27, 91, 70})
seqEndSc = string([]byte{27, 91, 52, 126}) seqEndSc = string([]byte{27, 91, 52, 126})
seqDelete = string([]byte{27, 91, 51, 126}) seqDelete = string([]byte{27, 91, 51, 126})
seqDelete2 = string([]byte{27, 91, 80}) seqShiftTab = string([]byte{27, 91, 90})
seqShiftTab = string([]byte{27, 91, 90}) seqAltQuote = string([]byte{27, 34}) // Added for showing registers ^["
seqAltQuote = string([]byte{27, 34}) // Added for showing registers ^[" seqAltR = string([]byte{27, 114}) // Used for alternative history
seqAltR = string([]byte{27, 114}) // Used for alternative history
seqAltBackspace = string([]byte{27, 127})
) )
const ( const (

View File

@ -712,15 +712,12 @@ func (rl *Instance) escapeSeq(r []rune) {
rl.updateHelpers() rl.updateHelpers()
return return
case seqDelete,seqDelete2: case seqDelete:
if rl.modeTabFind { if rl.modeTabFind {
rl.backspaceTabFind() rl.backspaceTabFind()
} else { } else {
if (rl.pos < len(rl.line)) { rl.deleteBackspace(true)
rl.deleteBackspace(true)
}
} }
case seqHome, seqHomeSc: case seqHome, seqHomeSc:
if rl.modeTabCompletion { if rl.modeTabCompletion {
return return
@ -755,19 +752,6 @@ func (rl *Instance) escapeSeq(r []rune) {
rl.updateTabFind([]rune{}) rl.updateTabFind([]rune{})
rl.viUndoSkipAppend = true rl.viUndoSkipAppend = true
case seqAltBackspace:
if rl.modeTabCompletion {
rl.resetVirtualComp(false)
}
// This is only available in Insert mode
if rl.modeViMode != VimInsert {
return
}
rl.saveToRegister(rl.viJumpB(tokeniseLine))
rl.viDeleteByAdjust(rl.viJumpB(tokeniseLine))
rl.updateHelpers()
default: default:
if rl.modeTabFind { if rl.modeTabFind {
return return