dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-12-22 23:08:00 +00:00
Code Issues Releases Wiki Activity

Merge upstream/master

Browse Source
This commit is contained in:
Daniel Carrillo 2019-01-11 18:24:30 +01:00
commit c2c53592a1
9 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/completion/external

@ -1 +1 @@
Subproject commit 8ec8c8c5c662c3cb77231b7458ce1975d2f8c967 Subproject commit cf565254e26bb7ce03f51889e9a29953b955b1fb

2
modules/fasd/external

@ -1 +1 @@
Subproject commit 90b531a5daaa545c74c7d98974b54cbdb92659fc Subproject commit 48220241e764fdf46b075cd7fe723468aaadde58

2
modules/history-substring-search/external

@ -1 +1 @@
Subproject commit 47a7d416c652a109f6e8856081abc042b50125f4 Subproject commit aae3388491c2312c4efb2e86bcb999927bb2900e

5
modules/history/README.md
View File

@ -8,8 +8,9 @@ Options
- `BANG_HIST` treats the **!** character specially during expansion. - `BANG_HIST` treats the **!** character specially during expansion.
- `EXTENDED_HISTORY` writes the history file in the *:start:elapsed;command* format. - `EXTENDED_HISTORY` writes the history file in the *:start:elapsed;command* format.
- `INC_APPEND_HISTORY` writes to the history file immediately, not when the shell exits. - `SHARE_HISTORY` shares history between all sessions. Note that
- `SHARE_HISTORY` shares history between all sessions. `SHARE_HISTORY`, `INC_APPEND_HISTORY`, and `INC_APPEND_HISTORY_TIME` are
mutually exclusive.
- `HIST_EXPIRE_DUPS_FIRST` expires a duplicate event first when trimming history. - `HIST_EXPIRE_DUPS_FIRST` expires a duplicate event first when trimming history.
- `HIST_IGNORE_DUPS` does not record an event that was just recorded again. - `HIST_IGNORE_DUPS` does not record an event that was just recorded again.
- `HIST_IGNORE_ALL_DUPS` deletes an old recorded event if a new event is a duplicate. - `HIST_IGNORE_ALL_DUPS` deletes an old recorded event if a new event is a duplicate.

1
modules/history/init.zsh
View File

@ -12,7 +12,6 @@
setopt BANG_HIST # Treat the '!' character specially during expansion. setopt BANG_HIST # Treat the '!' character specially during expansion.
setopt EXTENDED_HISTORY # Write the history file in the ':start:elapsed;command' format. setopt EXTENDED_HISTORY # Write the history file in the ':start:elapsed;command' format.
setopt INC_APPEND_HISTORY # Write to the history file immediately, not when the shell exits.
setopt SHARE_HISTORY # Share history between all sessions. setopt SHARE_HISTORY # Share history between all sessions.
setopt HIST_EXPIRE_DUPS_FIRST # Expire a duplicate event first when trimming history. setopt HIST_EXPIRE_DUPS_FIRST # Expire a duplicate event first when trimming history.
setopt HIST_IGNORE_DUPS # Do not record an event that was just recorded again. setopt HIST_IGNORE_DUPS # Do not record an event that was just recorded again.

2
modules/node/init.zsh
View File

@ -34,7 +34,7 @@ fi
typeset -A compl_commands=( typeset -A compl_commands=(
npm 'npm completion' npm 'npm completion'
grunt 'grunt --completion=zsh' grunt 'grunt --completion=zsh'
gupl 'gulp --completion=zsh' gulp 'gulp --completion=zsh'
) )
for compl_command in "${(k)compl_commands[@]}"; do for compl_command in "${(k)compl_commands[@]}"; do

2
modules/prompt/external/pure vendored

@ -1 +1 @@
Subproject commit fa9137ecec76d23fe76fd6fabe9c2f8ae0de9cf5 Subproject commit 7aade5fca2acae3f10e260d0c076af6356da9dc6

2
modules/prompt/functions/prompt_sorin_setup
View File

@ -110,8 +110,6 @@ function prompt_sorin_setup {
setopt LOCAL_OPTIONS setopt LOCAL_OPTIONS
unsetopt XTRACE KSH_ARRAYS unsetopt XTRACE KSH_ARRAYS
prompt_opts=(cr percent sp subst) prompt_opts=(cr percent sp subst)
_prompt_sorin_precmd_async_pid=0
_prompt_sorin_precmd_async_data=$(mktemp "${TMPDIR:-/tmp}/sorin-prompt-async-XXXXXXXXXX")
# Load required functions. # Load required functions.
autoload -Uz add-zsh-hook autoload -Uz add-zsh-hook

2
modules/syntax-highlighting/external

@ -1 +1 @@
Subproject commit e900ad8bad53501689afcb050456400d7a8466e5 Subproject commit 1e34c4aa0bcbdde5173aab15600784edf0a212fd