From e537ee9db95966af3439b550c15d8971805c73cf Mon Sep 17 00:00:00 2001 From: Alexei Danchenkov Date: Thu, 20 Mar 2014 19:10:44 -0700 Subject: [PATCH 1/4] added terminfo keys verification --- lib/key-bindings.zsh | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh index 94f1842f..33046b0f 100644 --- a/lib/key-bindings.zsh +++ b/lib/key-bindings.zsh @@ -20,24 +20,40 @@ bindkey -e # Use emacs key bindings bindkey '\ew' kill-region # [Esc-w] - Kill from the cursor to the mark bindkey -s '\el' 'ls\n' # [Esc-l] - run command: ls bindkey '^r' history-incremental-search-backward # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line. -bindkey "${terminfo[kpp]}" up-line-or-history # [PageUp] - Up a line of history -bindkey "${terminfo[knp]}" down-line-or-history # [PageDown] - Down a line of history +if [[ "${terminfo[kpp]}" != "" ]]; then + bindkey "${terminfo[kpp]}" up-line-or-history # [PageUp] - Up a line of history +fi +if [[ "${terminfo[knp]}" != "" ]]; then + bindkey "${terminfo[knp]}" down-line-or-history # [PageDown] - Down a line of history +fi -bindkey "${terminfo[kcuu1]}" up-line-or-search # start typing + [Up-Arrow] - fuzzy find history forward -bindkey "${terminfo[kcud1]}" down-line-or-search # start typing + [Down-Arrow] - fuzzy find history backward +if [[ "${terminfo[kcuu1]}" != "" ]]; then + bindkey "${terminfo[kcuu1]}" up-line-or-search # start typing + [Up-Arrow] - fuzzy find history forward +fi +if [[ "${terminfo[kcud1]}" != "" ]]; then + bindkey "${terminfo[kcud1]}" down-line-or-search # start typing + [Down-Arrow] - fuzzy find history backward +fi -bindkey "${terminfo[khome]}" beginning-of-line # [Home] - Go to beginning of line -bindkey "${terminfo[kend]}" end-of-line # [End] - Go to end of line +if [[ "${terminfo[khome]}" != "" ]]; then + bindkey "${terminfo[khome]}" beginning-of-line # [Home] - Go to beginning of line +fi +if [[ "${terminfo[kend]}" != "" ]]; then + bindkey "${terminfo[kend]}" end-of-line # [End] - Go to end of line +fi bindkey ' ' magic-space # [Space] - do history expansion bindkey '^[[1;5C' forward-word # [Ctrl-RightArrow] - move forward one word bindkey '^[[1;5D' backward-word # [Ctrl-LeftArrow] - move backward one word -bindkey "${terminfo[kcbt]}" reverse-menu-complete # [Shift-Tab] - move through the completion menu backwards +if [[ "${terminfo[kdch1]}" != "" ]]; then + bindkey "${terminfo[kdch1]}" reverse-menu-complete # [Shift-Tab] - move through the completion menu backwards +fi bindkey '^?' backward-delete-char # [Backspace] - delete backward -bindkey "${terminfo[kdch1]}" delete-char # [Delete] - delete forward +if [[ "${terminfo[kdch1]}" != "" ]]; then + bindkey "${terminfo[kdch1]}" delete-char # [Delete] - delete forward +fi # Edit the current command line in $EDITOR autoload -U edit-command-line From 55a9d685fd960390a4f400ac461d901049a78beb Mon Sep 17 00:00:00 2001 From: Alexei Danchenkov Date: Thu, 20 Mar 2014 19:29:06 -0700 Subject: [PATCH 2/4] Update key-bindings.zsh Aligned comments --- lib/key-bindings.zsh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh index 33046b0f..49deb058 100644 --- a/lib/key-bindings.zsh +++ b/lib/key-bindings.zsh @@ -15,11 +15,11 @@ if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then zle -N zle-line-finish fi -bindkey -e # Use emacs key bindings +bindkey -e # Use emacs key bindings -bindkey '\ew' kill-region # [Esc-w] - Kill from the cursor to the mark -bindkey -s '\el' 'ls\n' # [Esc-l] - run command: ls -bindkey '^r' history-incremental-search-backward # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line. +bindkey '\ew' kill-region # [Esc-w] - Kill from the cursor to the mark +bindkey -s '\el' 'ls\n' # [Esc-l] - run command: ls +bindkey '^r' history-incremental-search-backward # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line. if [[ "${terminfo[kpp]}" != "" ]]; then bindkey "${terminfo[kpp]}" up-line-or-history # [PageUp] - Up a line of history fi @@ -41,16 +41,16 @@ if [[ "${terminfo[kend]}" != "" ]]; then bindkey "${terminfo[kend]}" end-of-line # [End] - Go to end of line fi -bindkey ' ' magic-space # [Space] - do history expansion +bindkey ' ' magic-space # [Space] - do history expansion -bindkey '^[[1;5C' forward-word # [Ctrl-RightArrow] - move forward one word -bindkey '^[[1;5D' backward-word # [Ctrl-LeftArrow] - move backward one word +bindkey '^[[1;5C' forward-word # [Ctrl-RightArrow] - move forward one word +bindkey '^[[1;5D' backward-word # [Ctrl-LeftArrow] - move backward one word if [[ "${terminfo[kdch1]}" != "" ]]; then - bindkey "${terminfo[kdch1]}" reverse-menu-complete # [Shift-Tab] - move through the completion menu backwards + bindkey "${terminfo[kdch1]}" reverse-menu-complete # [Shift-Tab] - move through the completion menu backwards fi -bindkey '^?' backward-delete-char # [Backspace] - delete backward +bindkey '^?' backward-delete-char # [Backspace] - delete backward if [[ "${terminfo[kdch1]}" != "" ]]; then bindkey "${terminfo[kdch1]}" delete-char # [Delete] - delete forward fi From c5413d7dd18cad7cd4eb32ddf1b9976863b87dfa Mon Sep 17 00:00:00 2001 From: Alexei Danchenkov Date: Thu, 20 Mar 2014 19:34:43 -0700 Subject: [PATCH 3/4] Aligned comments --- lib/key-bindings.zsh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh index 49deb058..28af4494 100644 --- a/lib/key-bindings.zsh +++ b/lib/key-bindings.zsh @@ -15,11 +15,11 @@ if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then zle -N zle-line-finish fi -bindkey -e # Use emacs key bindings +bindkey -e # Use emacs key bindings -bindkey '\ew' kill-region # [Esc-w] - Kill from the cursor to the mark -bindkey -s '\el' 'ls\n' # [Esc-l] - run command: ls -bindkey '^r' history-incremental-search-backward # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line. +bindkey '\ew' kill-region # [Esc-w] - Kill from the cursor to the mark +bindkey -s '\el' 'ls\n' # [Esc-l] - run command: ls +bindkey '^r' history-incremental-search-backward # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line. if [[ "${terminfo[kpp]}" != "" ]]; then bindkey "${terminfo[kpp]}" up-line-or-history # [PageUp] - Up a line of history fi @@ -41,16 +41,16 @@ if [[ "${terminfo[kend]}" != "" ]]; then bindkey "${terminfo[kend]}" end-of-line # [End] - Go to end of line fi -bindkey ' ' magic-space # [Space] - do history expansion +bindkey ' ' magic-space # [Space] - do history expansion -bindkey '^[[1;5C' forward-word # [Ctrl-RightArrow] - move forward one word -bindkey '^[[1;5D' backward-word # [Ctrl-LeftArrow] - move backward one word +bindkey '^[[1;5C' forward-word # [Ctrl-RightArrow] - move forward one word +bindkey '^[[1;5D' backward-word # [Ctrl-LeftArrow] - move backward one word if [[ "${terminfo[kdch1]}" != "" ]]; then - bindkey "${terminfo[kdch1]}" reverse-menu-complete # [Shift-Tab] - move through the completion menu backwards + bindkey "${terminfo[kdch1]}" reverse-menu-complete # [Shift-Tab] - move through the completion menu backwards fi -bindkey '^?' backward-delete-char # [Backspace] - delete backward +bindkey '^?' backward-delete-char # [Backspace] - delete backward if [[ "${terminfo[kdch1]}" != "" ]]; then bindkey "${terminfo[kdch1]}" delete-char # [Delete] - delete forward fi From 32a7824182731081c7cbeba363be7b6f56aeb2a5 Mon Sep 17 00:00:00 2001 From: Alexei Danchenkov Date: Fri, 21 Mar 2014 09:24:59 -0700 Subject: [PATCH 4/4] Added a forward-delete fallback to bind Delete key Delete key (of Fn+Delete on Mac) would print "~" instead of deletion. --- lib/key-bindings.zsh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh index 28af4494..5f3f237c 100644 --- a/lib/key-bindings.zsh +++ b/lib/key-bindings.zsh @@ -53,6 +53,10 @@ fi bindkey '^?' backward-delete-char # [Backspace] - delete backward if [[ "${terminfo[kdch1]}" != "" ]]; then bindkey "${terminfo[kdch1]}" delete-char # [Delete] - delete forward +else + bindkey "^[[3~" delete-char + bindkey "^[3;5~" delete-char + bindkey "\e[3~" delete-char fi # Edit the current command line in $EDITOR