summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--12_Prompts.zsh1
-rw-r--r--net:foret/Prompts.zsh2
-rw-r--r--user:hugues/KeyBindings.zsh4
-rw-r--r--user:hugues/Vim.zsh4
4 files changed, 6 insertions, 5 deletions
diff --git a/12_Prompts.zsh b/12_Prompts.zsh
index f7060af..4a8b1b6 100644
--- a/12_Prompts.zsh
+++ b/12_Prompts.zsh
@@ -270,6 +270,7 @@ __redefine_prompt ()
;;
esac
}
+zle -N __redefine_prompt
__yeah_prompt ()
{
diff --git a/net:foret/Prompts.zsh b/net:foret/Prompts.zsh
index 2f75891..c920cf8 100644
--- a/net:foret/Prompts.zsh
+++ b/net:foret/Prompts.zsh
@@ -75,5 +75,5 @@ __makeflags ()
}
PS1_TASKBAR+=(__makeflags __verbose_compilation __nproc_compilation)
-PS1_EXTRA_INFO+=(__static_dynamic __compilation_arch __compilation_os __compilation_target)
+PS1_EXTRA_INFO+=(__static_dynamic __compilation_os __compilation_arch __compilation_target)
diff --git a/user:hugues/KeyBindings.zsh b/user:hugues/KeyBindings.zsh
index a79047f..5419e5b 100644
--- a/user:hugues/KeyBindings.zsh
+++ b/user:hugues/KeyBindings.zsh
@@ -56,7 +56,7 @@ bindkey '^F' forward-char
bindkey '^G' send-break
bindkey '^H' backward-delete-char
bindkey '^I' expand-or-complete
-bindkey '^J' accept-line
+bindkey '^J' accept-line # '\n' is considered as ^J
bindkey '^K' kill-line
bindkey '^L' clear-screen
bindkey '^M' accept-line
@@ -237,7 +237,7 @@ do
bindkey -M $keymap '^[q' push-input
bindkey -M $keymap '^[Q' push-input
- bindkey -M $keymap -s '^[R' '^[Q __clear\n'
+ bindkey -M $keymap -s '^[R' '^[Q up_up ; __redefine_prompt\n^[xreset-prompt\n'
bindkey -M $keymap -s '^[B' '^[Q __clear $(tput lines)\n'
done
diff --git a/user:hugues/Vim.zsh b/user:hugues/Vim.zsh
index f43978a..e452257 100644
--- a/user:hugues/Vim.zsh
+++ b/user:hugues/Vim.zsh
@@ -44,7 +44,7 @@ psvmodeidx='8'
# If this is set to `yes', use `C-d' instead of `ESC' to switch from insert
# mode to command mode. `ESC' may require a timeout to actually take effect.
# Using `C-d' will work immediately. Therefore that is the default.
-zle_use_ctrl_d='no'
+zle_use_ctrl_d='yes'
# If set to `yes', make viins mode behave more like `emacs' mode. Bindings
# such as `^r' and `^s' will work. Backspace and `^w' will work more like
@@ -90,7 +90,7 @@ function ft-psvx() {
if [[ ${ft_zle_state[overwrite]} == yes ]]; then
psvar[$psvmodeidx]='REP'
else
- psvar[$psvmodeidx]='INS'
+ psvar[$psvmodeidx]=''
fi
;;
esac