1
0
mirror of https://github.com/dcarrillo/prezto.git synced 2025-07-01 06:59:25 +00:00

Merge upstream/master

This commit is contained in:
2019-01-11 18:24:30 +01:00
9 changed files with 9 additions and 11 deletions

View File

@ -8,8 +8,9 @@ Options
- `BANG_HIST` treats the **!** character specially during expansion.
- `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.
- `SHARE_HISTORY` shares history between all sessions. Note that
`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_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.

View File

@ -12,7 +12,6 @@
setopt BANG_HIST # Treat the '!' character specially during expansion.
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 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.

View File

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

View File

@ -110,8 +110,6 @@ function prompt_sorin_setup {
setopt LOCAL_OPTIONS
unsetopt XTRACE KSH_ARRAYS
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.
autoload -Uz add-zsh-hook