Merge upstream/master

Add ^_ mapping to undo in viins mode (#1860 )
This allows to cancel a tab completion, as ^_ in emacs mode.
2020-08-01 18:12:16 +02:00 · 2020-07-30 13:29:59 -07:00 · 2020-07-27 12:49:40 -07:00 · 2020-07-22 10:28:53 -07:00 · 2020-07-20 16:08:54 -07:00 · 2020-07-20 16:07:53 -07:00
6 changed files with 13 additions and 3 deletions
--- 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:
--- a/modules/completion/external
+++ b/modules/completion/external
@ -1 +1 @@
-Subproject commit cf565254e26bb7ce03f51889e9a29953b955b1fb
+Subproject commit ed4ff5384b03aa775a57d4c9588c88850026b0b3
--- 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
--- 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 ]]
+}
--- 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"
--- a/modules/utility/init.zsh
+++ b/modules/utility/init.zsh
@ -140,6 +140,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'
Author	SHA1	Message	Date
Daniel Carrillo	813bde4d44	Merge upstream/master	2020-08-01 18:12:16 +02:00
Matthieu PETIOT	38882275b8	Add ^_ mapping to undo in viins mode (#1860 ) This allows to cancel a tab completion, as ^_ in emacs mode.	2020-07-30 13:29:59 -07:00
Olaf Conradi	e9197234cf	Add check for empty WORKON_HOME (#1861 ) When $WORKON_HOME is not set and $ENV_NAME is equal to $PROJECT_ROOT/.venv which contains bin/activate then the code wrongly assumes workon is available. It should execute the second branch to source bin/activate.	2020-07-27 12:49:40 -07:00
Yasuharu Iida	685da200d7	completion: bump version to tags/0.32.0 (#1856 )	2020-07-22 10:28:53 -07:00
kwgchi	cb8b9ca746	README: fix small grammatical error (#1857 )	2020-07-20 16:08:54 -07:00
Austin Sloane	4e7ab4b8b7	utility, helper: add aliases to use with termux terminal emulator (android) (#1859 )	2020-07-20 16:07:53 -07:00