dcarrillo
/
prezto
mirror of https://github.com/dcarrillo/prezto.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge upstream/master

This commit is contained in:
Daniel Carrillo 2020-08-01 18:12:16 +02:00
parent 677e301174 38882275b8
commit 813bde4d44
6 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -59,7 +59,7 @@ Updating
Run `zprezto-update` to automatically check if there is an update to zprezto. 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 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. the `$ZPREZTODIR` directory and resolve them yourself.
To pull the latest changes and update submodules manually: To pull the latest changes and update submodules manually:

2
modules/completion/external

@ -1 +1 @@
Subproject commit cf565254e26bb7ce03f51889e9a29953b955b1fb Subproject commit ed4ff5384b03aa775a57d4c9588c88850026b0b3

1
modules/editor/init.zsh
View File

@ -318,6 +318,7 @@ bindkey -M vicmd "$key_info[Control]X$key_info[Control]E" edit-command-line
# Undo/Redo # Undo/Redo
bindkey -M vicmd "u" undo bindkey -M vicmd "u" undo
bindkey -M viins "$key_info[Control]_" undo
bindkey -M vicmd "$key_info[Control]R" redo bindkey -M vicmd "$key_info[Control]R" redo
if (( $+widgets[history-incremental-pattern-search-backward] )); then if (( $+widgets[history-incremental-pattern-search-backward] )); then

5
modules/helper/init.zsh
View File

@ -49,3 +49,8 @@ function is-bsd {
function is-cygwin { function is-cygwin {
[[ "$OSTYPE" == cygwin* ]] [[ "$OSTYPE" == cygwin* ]]
} }
# is true on termux (Android)
function is-termux {
[[ "$OSTYPE" == linux-android ]]
}

2
modules/python/init.zsh
View File

@ -71,7 +71,7 @@ function _python-workon-cwd {
if [[ "$ENV_NAME" != "" ]]; then if [[ "$ENV_NAME" != "" ]]; then
# Activate the environment only if it is not already active # Activate the environment only if it is not already active
if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then 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" workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
elif [[ -e "$ENV_NAME/bin/activate" ]]; then elif [[ -e "$ENV_NAME/bin/activate" ]]; then
source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME" source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"

4
modules/utility/init.zsh
View File

@ -140,6 +140,10 @@ elif is-cygwin; then
alias o='cygstart' alias o='cygstart'
alias pbcopy='tee > /dev/clipboard' alias pbcopy='tee > /dev/clipboard'
alias pbpaste='cat /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 else
alias o='xdg-open' alias o='xdg-open'