From 4a16d3fa50f6596fe13affd90107d25710c88e43 Mon Sep 17 00:00:00 2001 From: Jeff Widman Date: Wed, 2 Jan 2019 18:04:07 -0800 Subject: [PATCH 1/5] Fix typo: gupl --> gulp (#1668) --- modules/node/init.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/node/init.zsh b/modules/node/init.zsh index f452ec5..d8eea14 100644 --- a/modules/node/init.zsh +++ b/modules/node/init.zsh @@ -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 From 88456ec9b6c0ef4eb18381bca1942474e27336a4 Mon Sep 17 00:00:00 2001 From: Diego Rabatone Oliveira Date: Mon, 7 Jan 2019 10:41:23 -0200 Subject: [PATCH 2/5] Updating submodules to lastest tags/master commits --- modules/completion/external | 2 +- modules/fasd/external | 2 +- modules/history-substring-search/external | 2 +- modules/prompt/external/pure | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/completion/external b/modules/completion/external index 8ec8c8c..cf56525 160000 --- a/modules/completion/external +++ b/modules/completion/external @@ -1 +1 @@ -Subproject commit 8ec8c8c5c662c3cb77231b7458ce1975d2f8c967 +Subproject commit cf565254e26bb7ce03f51889e9a29953b955b1fb diff --git a/modules/fasd/external b/modules/fasd/external index 90b531a..4822024 160000 --- a/modules/fasd/external +++ b/modules/fasd/external @@ -1 +1 @@ -Subproject commit 90b531a5daaa545c74c7d98974b54cbdb92659fc +Subproject commit 48220241e764fdf46b075cd7fe723468aaadde58 diff --git a/modules/history-substring-search/external b/modules/history-substring-search/external index 47a7d41..aae3388 160000 --- a/modules/history-substring-search/external +++ b/modules/history-substring-search/external @@ -1 +1 @@ -Subproject commit 47a7d416c652a109f6e8856081abc042b50125f4 +Subproject commit aae3388491c2312c4efb2e86bcb999927bb2900e diff --git a/modules/prompt/external/pure b/modules/prompt/external/pure index fa9137e..7aade5f 160000 --- a/modules/prompt/external/pure +++ b/modules/prompt/external/pure @@ -1 +1 @@ -Subproject commit fa9137ecec76d23fe76fd6fabe9c2f8ae0de9cf5 +Subproject commit 7aade5fca2acae3f10e260d0c076af6356da9dc6 From ba4063f99e0b2d531a55b375ca92314e3a9a178b Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sun, 6 Jan 2019 11:24:34 +0100 Subject: [PATCH 3/5] Remove old prompt tempfile and pid variable This is a leftover of #1385, the temp file and the PID variable is not needed any more. --- modules/prompt/functions/prompt_sorin_setup | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/prompt/functions/prompt_sorin_setup b/modules/prompt/functions/prompt_sorin_setup index 14f8858..2df9212 100644 --- a/modules/prompt/functions/prompt_sorin_setup +++ b/modules/prompt/functions/prompt_sorin_setup @@ -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 From 777674e07e4f2fd465b273341c639263f379394d Mon Sep 17 00:00:00 2001 From: Diego Rabatone Oliveira Date: Mon, 7 Jan 2019 10:42:34 -0200 Subject: [PATCH 4/5] Update syntax-highlighting submodule --- modules/syntax-highlighting/external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/syntax-highlighting/external b/modules/syntax-highlighting/external index e900ad8..1e34c4a 160000 --- a/modules/syntax-highlighting/external +++ b/modules/syntax-highlighting/external @@ -1 +1 @@ -Subproject commit e900ad8bad53501689afcb050456400d7a8466e5 +Subproject commit 1e34c4aa0bcbdde5173aab15600784edf0a212fd From 4abbc5572149baa6a5e7e38393a4b2006f01024f Mon Sep 17 00:00:00 2001 From: Yutian Li Date: Fri, 4 Jan 2019 13:05:37 -0500 Subject: [PATCH 5/5] remove mutually exclusive option --- modules/history/README.md | 5 +++-- modules/history/init.zsh | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/history/README.md b/modules/history/README.md index d020688..a5a4acb 100644 --- a/modules/history/README.md +++ b/modules/history/README.md @@ -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. diff --git a/modules/history/init.zsh b/modules/history/init.zsh index db357b0..a26f3c9 100644 --- a/modules/history/init.zsh +++ b/modules/history/init.zsh @@ -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.