mirror of
https://github.com/Llewellynvdm/fzf.git
synced 2024-06-03 07:50:49 +00:00
Bind CTRL-D to the new delete-char/eof action
- CTRL-D - delete-char/eof - DEL - delete-char
This commit is contained in:
parent
cc0d5539ba
commit
13e040baee
|
@ -11,6 +11,7 @@ CHANGELOG
|
||||||
- `--header-lines`
|
- `--header-lines`
|
||||||
- Added `eof` action which closes the finder only when the input is empty
|
- Added `eof` action which closes the finder only when the input is empty
|
||||||
- e.g. `export FZF_DEFAULT_OPTS="--bind esc:eof"`
|
- e.g. `export FZF_DEFAULT_OPTS="--bind esc:eof"`
|
||||||
|
- Added `delete-char/eof` action to differentiate `CTRL-D` and `DEL`
|
||||||
|
|
||||||
### Minor improvements/fixes
|
### Minor improvements/fixes
|
||||||
|
|
||||||
|
|
|
@ -189,7 +189,8 @@ e.g. \fBfzf --bind=ctrl-j:accept,ctrl-k:kill-line\fR
|
||||||
\fBbackward-word\fR \fIalt-b shift-left\fR
|
\fBbackward-word\fR \fIalt-b shift-left\fR
|
||||||
\fBbeginning-of-line\fR \fIctrl-a home\fR
|
\fBbeginning-of-line\fR \fIctrl-a home\fR
|
||||||
\fBclear-screen\fR \fIctrl-l\fR
|
\fBclear-screen\fR \fIctrl-l\fR
|
||||||
\fBdelete-char\fR \fIctrl-d del\fR
|
\fBdelete-char\fR \fIdel\fR
|
||||||
|
\fBdelete-char/eof\fR \fIctrl-d\fR
|
||||||
\fBdeselect-all\fR
|
\fBdeselect-all\fR
|
||||||
\fBdown\fR \fIctrl-j ctrl-n down\fR
|
\fBdown\fR \fIctrl-j ctrl-n down\fR
|
||||||
\fBend-of-line\fR \fIctrl-e end\fR
|
\fBend-of-line\fR \fIctrl-e end\fR
|
||||||
|
|
|
@ -497,6 +497,8 @@ func parseKeymap(keymap map[int]actionType, execmap map[int]string, toggleSort b
|
||||||
keymap[key] = actClearScreen
|
keymap[key] = actClearScreen
|
||||||
case "delete-char":
|
case "delete-char":
|
||||||
keymap[key] = actDeleteChar
|
keymap[key] = actDeleteChar
|
||||||
|
case "delete-char/eof":
|
||||||
|
keymap[key] = actDeleteCharEof
|
||||||
case "end-of-line":
|
case "end-of-line":
|
||||||
keymap[key] = actEndOfLine
|
keymap[key] = actEndOfLine
|
||||||
case "eof":
|
case "eof":
|
||||||
|
|
|
@ -102,6 +102,7 @@ const (
|
||||||
actBackwardWord
|
actBackwardWord
|
||||||
actClearScreen
|
actClearScreen
|
||||||
actDeleteChar
|
actDeleteChar
|
||||||
|
actDeleteCharEof
|
||||||
actEndOfLine
|
actEndOfLine
|
||||||
actEof
|
actEof
|
||||||
actForwardChar
|
actForwardChar
|
||||||
|
@ -137,7 +138,7 @@ func defaultKeymap() map[int]actionType {
|
||||||
keymap[C.CtrlG] = actAbort
|
keymap[C.CtrlG] = actAbort
|
||||||
keymap[C.CtrlQ] = actAbort
|
keymap[C.CtrlQ] = actAbort
|
||||||
keymap[C.ESC] = actAbort
|
keymap[C.ESC] = actAbort
|
||||||
keymap[C.CtrlD] = actDeleteChar
|
keymap[C.CtrlD] = actDeleteCharEof
|
||||||
keymap[C.CtrlE] = actEndOfLine
|
keymap[C.CtrlE] = actEndOfLine
|
||||||
keymap[C.CtrlF] = actForwardChar
|
keymap[C.CtrlF] = actForwardChar
|
||||||
keymap[C.CtrlH] = actBackwardDeleteChar
|
keymap[C.CtrlH] = actBackwardDeleteChar
|
||||||
|
@ -168,7 +169,7 @@ func defaultKeymap() map[int]actionType {
|
||||||
|
|
||||||
keymap[C.Home] = actBeginningOfLine
|
keymap[C.Home] = actBeginningOfLine
|
||||||
keymap[C.End] = actEndOfLine
|
keymap[C.End] = actEndOfLine
|
||||||
keymap[C.Del] = actDeleteChar // FIXME Del vs. CTRL-D
|
keymap[C.Del] = actDeleteChar
|
||||||
keymap[C.PgUp] = actPageUp
|
keymap[C.PgUp] = actPageUp
|
||||||
keymap[C.PgDn] = actPageDown
|
keymap[C.PgDn] = actPageDown
|
||||||
|
|
||||||
|
@ -809,6 +810,8 @@ func (t *Terminal) Loop() {
|
||||||
case actAbort:
|
case actAbort:
|
||||||
req(reqQuit)
|
req(reqQuit)
|
||||||
case actDeleteChar:
|
case actDeleteChar:
|
||||||
|
t.delChar()
|
||||||
|
case actDeleteCharEof:
|
||||||
if !t.delChar() && t.cx == 0 {
|
if !t.delChar() && t.cx == 0 {
|
||||||
req(reqQuit)
|
req(reqQuit)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user