Merge remote-tracking branch 'upstream/master'

# By Austin Sloane (1) and others # Via Kaleb Elwert * upstream/master: prompt: update powerlevel10k submodule to v1.13.0 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) README: fix small grammatical error (sorin-ionescu#1857) utility, helper: add aliases to use with termux terminal emulator (android) (sorin-ionescu#1859) # Conflicts: # modules/completion/external
trongrg · Nov 29, 2020 · 75feef4 · 75feef4
2 parents c9df701 + 0a40549
commit 75feef4
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ Updating
 
 Run `zprezto-update` to automatically check if there is an update to zprezto.
 If there are no file conflicts, zprezto and its submodules will be
-automatically updated. If there are conflicts you will instructed to go into
+automatically updated. If there are conflicts you will be instructed to go into
 the `$ZPREZTODIR` directory and resolve them yourself.
 
 To pull the latest changes and update submodules manually:

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/helper/init.zsh b/modules/helper/init.zsh
@@ -49,3 +49,8 @@ function is-bsd {
 function is-cygwin {
   [[ "$OSTYPE" == cygwin* ]]
 }
+
+# is true on termux (Android)
+function is-termux {
+  [[ "$OSTYPE" == linux-android ]]
+}
diff --git a/modules/prompt/external/powerlevel10k b/modules/prompt/external/powerlevel10k
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"

diff --git a/modules/utility/init.zsh b/modules/utility/init.zsh
@@ -143,6 +143,10 @@ elif is-cygwin; then
   alias o='cygstart'
   alias pbcopy='tee > /dev/clipboard'
   alias pbpaste='cat /dev/clipboard'
+elif is-termux; then
+  alias o='termux-open'
+  alias pbcopy='termux-clipboard-set'
+  alias pbpaste='termux-clipboard-get'
 else
   alias o='xdg-open'
+64 −51		README.md
+13 −11		config/p10k-classic.zsh
+13 −11		config/p10k-lean-8colors.zsh
+13 −11		config/p10k-lean.zsh
+1 −1		config/p10k-pure.zsh
+13 −11		config/p10k-rainbow.zsh
+1 −1		config/p10k-robbyrussell.zsh
+1 −0		gitstatus/build
+4 −4		gitstatus/gitstatus.plugin.sh
+9 −3		gitstatus/gitstatus.plugin.zsh
+4 −1		gitstatus/install.info
+2 −2		gitstatus/src/gitstatus.cc
+16 −4		internal/configure.zsh
+7 −1		internal/icons.zsh
+151 −60		internal/p10k.zsh
+54 −23		internal/wizard.zsh