From 4e7ab4b8b79c9009991f2552b5ee5d7e73abbcba Mon Sep 17 00:00:00 2001 From: Austin Sloane Date: Mon, 20 Jul 2020 16:07:53 -0700 Subject: [PATCH 1/5] utility, helper: add aliases to use with termux terminal emulator (android) (#1859) --- modules/helper/init.zsh | 5 +++++ modules/utility/init.zsh | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/modules/helper/init.zsh b/modules/helper/init.zsh index 6e83f89..0553556 100644 --- 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/utility/init.zsh b/modules/utility/init.zsh index caa0ec8..7bb7532 100644 --- 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' From cb8b9ca7462e923e187da46e9ac3f45f55d8bf07 Mon Sep 17 00:00:00 2001 From: kwgchi Date: Tue, 21 Jul 2020 08:08:54 +0900 Subject: [PATCH 2/5] README: fix small grammatical error (#1857) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 552784b..45ef61c 100644 --- 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: From 685da200d72bd574c7e1ca82bb102f3e717e4580 Mon Sep 17 00:00:00 2001 From: Yasuharu Iida Date: Thu, 23 Jul 2020 02:28:53 +0900 Subject: [PATCH 3/5] completion: bump version to tags/0.32.0 (#1856) --- modules/completion/external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/completion/external b/modules/completion/external index cf56525..ed4ff53 160000 --- a/modules/completion/external +++ b/modules/completion/external @@ -1 +1 @@ -Subproject commit cf565254e26bb7ce03f51889e9a29953b955b1fb +Subproject commit ed4ff5384b03aa775a57d4c9588c88850026b0b3 From e9197234cfd051effa75fa98344f845e1d818972 Mon Sep 17 00:00:00 2001 From: Olaf Conradi Date: Mon, 27 Jul 2020 21:49:40 +0200 Subject: [PATCH 4/5] 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. --- modules/python/init.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/python/init.zsh b/modules/python/init.zsh index 33248ba..b878f04 100644 --- 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" From 38882275b8936218aabec7a7c760514187dd7fe9 Mon Sep 17 00:00:00 2001 From: Matthieu PETIOT Date: Thu, 30 Jul 2020 22:29:59 +0200 Subject: [PATCH 5/5] Add ^_ mapping to undo in viins mode (#1860) This allows to cancel a tab completion, as ^_ in emacs mode. --- modules/editor/init.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/editor/init.zsh b/modules/editor/init.zsh index 28a2fb2..5b411f5 100644 --- 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