Merge commit '38882275b8936218aabec7a7c760514187dd7fe9'

* commit '38882275b8936218aabec7a7c760514187dd7fe9': Add ^_ mapping to undo in viins mode (sorin-ionescu#1860) Add check for empty WORKON_HOME (sorin-ionescu#1861) completion: bump version to tags/0.32.0 (sorin-ionescu#1856)
dcato · Aug 6, 2020 · 5422cd6 · 5422cd6
2 parents d1850ad + 3888227
commit 5422cd6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/modules/completion/external b/modules/completion/external
diff --git a/modules/editor/init.zsh b/modules/editor/init.zsh
@@ -318,6 +318,7 @@ bindkey -M vicmd "$key_info[Control]X$key_info[Control]E" edit-command-line
 
 # Undo/Redo
 bindkey -M vicmd "u" undo
+bindkey -M viins "$key_info[Control]_" undo
 bindkey -M vicmd "$key_info[Control]R" redo
 
 if (( $+widgets[history-incremental-pattern-search-backward] )); then

diff --git a/modules/python/init.zsh b/modules/python/init.zsh
@@ -71,7 +71,7 @@ function _python-workon-cwd {
   if [[ "$ENV_NAME" != "" ]]; then
     # Activate the environment only if it is not already active
     if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
-      if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
+      if [[ -n "$WORKON_HOME" && -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
         workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
       elif [[ -e "$ENV_NAME/bin/activate" ]]; then
         source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"
+1 −1		CONTRIBUTING.md
+2 −2		README.md
+50 −21		src/_bitcoin-cli
+1 −1		src/_bundle
+7 −7		src/_ccache
+1 −1		src/_cf
+113 −12		src/_cmake
+1 −1		src/_conan
+1,517 −0		src/_concourse
+115 −0		src/_cppcheck
+10 −1		src/_dget
+1 −1		src/_diana
+4 −4		src/_drush
+27 −4		src/_emulator
+1 −1		src/_exportfs
+3 −3		src/_fab
+339 −0		src/_fail2ban-client
+1 −0		src/_ffind
+114 −0		src/_flameshot
+293 −0		src/_fwupdmgr
+2 −2		src/_ghc
+1 −2		src/_git-flow
+52 −0		src/_git-revise
+8 −1		src/_git-wtf
+425 −44		src/_golang
+1 −1		src/_hledger
+23 −5		src/_httpie
+146 −0		src/_inxi
+2 −1		src/_jrnl
+2 −1		src/_kitchen
+76 −0		src/_mc
+1 −1		src/_middleman
+5 −0		src/_mix
+0 −163		src/_multirust
+53 −0		src/_nano
+1 −1		src/_nftables
+71 −5		src/_node
+10 −10		src/_openssl
+795 −19		src/_perf
+27 −11		src/_pgsql_utils
+2 −2		src/_play
+179 −0		src/_pm2
+4 −1		src/_port
+84 −0		src/_protoc
+1 −1		src/_rspec
+0 −142		src/_rvm
+1 −1		src/_scala
+1 −1		src/_scrub
+1 −1		src/_setup.py
+2 −2		src/_sfdx
+4 −4		src/_showoff
+2 −2		src/_udisksctl
+1 −0		src/_ufw
+2 −2		src/_vagrant
+2 −2		src/_vnstat
+161 −41		src/_yarn
+2 −2		zsh-completions-howto.org