From 2ab41d508d453be2305b898325a9a87f00aaebda Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Wed, 25 Nov 2015 01:46:55 +0000 Subject: 37215: _regex_words: Don't add mismatched parentheses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I ran into this in the wild¹, it manifested as the following error message: zregexparse:4: not enough regex arguments ¹ https://bug.tasktools.org/browse/TW-1729 --- ChangeLog | 5 +++++ Completion/Base/Utility/_regex_words | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a1034cfcc..3fabfc5e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-11-27 Daniel Shahaf + + * 37215: Completion/Base/Utility/_regex_words: _regex_words: + Don't add mismatched parentheses + 2015-11-26 Barton E. Schaefer * 37229: Src/Modules/param_private.c, Test/V10private.ztst: non- diff --git a/Completion/Base/Utility/_regex_words b/Completion/Base/Utility/_regex_words index 77ba197a4..62c2491bb 100644 --- a/Completion/Base/Utility/_regex_words +++ b/Completion/Base/Utility/_regex_words @@ -20,7 +20,13 @@ local tag=$1 local desc=$2 shift 2 -reply=(\() +if (( $# )); then + reply=(\() +else + # ### Is this likely to happen in callers? Should we warn? + reply=() + return +fi integer i local -a wds -- cgit 1.4.1 From 06a24d37474b20ccd4ab2b8a255250ca99baa41b Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Fri, 20 Nov 2015 03:18:46 +0000 Subject: 37163: Remove curl completion --- ChangeLog | 3 +++ Completion/Unix/Command/_curl | 7 +++++++ Completion/Unix/Type/_urls | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 Completion/Unix/Command/_curl diff --git a/ChangeLog b/ChangeLog index 3fabfc5e3..d7e766e17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-11-27 Daniel Shahaf + * 37163: Completion/Unix/Command/_curl, + Completion/Unix/Type/_urls: Remove curl completion + * 37215: Completion/Base/Utility/_regex_words: _regex_words: Don't add mismatched parentheses diff --git a/Completion/Unix/Command/_curl b/Completion/Unix/Command/_curl new file mode 100644 index 000000000..72e2e5b53 --- /dev/null +++ b/Completion/Unix/Command/_curl @@ -0,0 +1,7 @@ +#compdef curl + +# As of 7.43.0, curl upstream provides its own _curl definition. This +# definition is provided as a fallback, and should be installed later +# in $fpath than the curl-provided definition of _curl. + +_urls "$@" diff --git a/Completion/Unix/Type/_urls b/Completion/Unix/Type/_urls index 6f23803ed..e81eaac05 100644 --- a/Completion/Unix/Type/_urls +++ b/Completion/Unix/Type/_urls @@ -1,4 +1,4 @@ -#compdef curl -value-,WWW_HOME,-default- -P -value-,(ftp|http(|s))_proxy,-default- +#compdef -value-,WWW_HOME,-default- -P -value-,(ftp|http(|s))_proxy,-default- # Configuration styles used: # -- cgit 1.4.1 From 694aee4c3dbc657b8ac05e035cae33fdf49130a2 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Wed, 25 Nov 2015 01:45:45 +0000 Subject: 37214: 'prompt walters': Don't export PS1 --- ChangeLog | 3 +++ Functions/Prompts/prompt_walters_setup | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7e766e17..b921f63c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2015-11-27 Daniel Shahaf + * 37214: Functions/Prompts/prompt_walters_setup: 'prompt + walters': Don't export PS1 + * 37163: Completion/Unix/Command/_curl, Completion/Unix/Type/_urls: Remove curl completion diff --git a/Functions/Prompts/prompt_walters_setup b/Functions/Prompts/prompt_walters_setup index b2b0b8430..7948254d8 100644 --- a/Functions/Prompts/prompt_walters_setup +++ b/Functions/Prompts/prompt_walters_setup @@ -14,10 +14,10 @@ EOF prompt_walters_setup () { if [[ "$TERM" != "dumb" ]]; then - export PROMPT='%B%(?..[%?] )%b%n@%U%m%u> ' - export RPROMPT="%F{${1:-green}}%~%f" + PROMPT='%B%(?..[%?] )%b%n@%U%m%u> ' + RPROMPT="%F{${1:-green}}%~%f" else - export PROMPT="%(?..[%?] )%n@%m:%~> " + PROMPT="%(?..[%?] )%n@%m:%~> " fi prompt_opts=(cr percent) -- cgit 1.4.1 From 8efa4b4088a9f57903954a12eb086b176109bd91 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Fri, 27 Nov 2015 09:31:46 +0000 Subject: unposted: ZCALCPROMPT created globally in zcalc --- ChangeLog | 4 ++++ Functions/Misc/zcalc | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b921f63c3..3b010f073 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-11-27 Peter Stephenson + + * unposted: Functions/Misc/zcalc: ZCALCPROMPT created globally. + 2015-11-27 Daniel Shahaf * 37214: Functions/Prompts/prompt_walters_setup: 'prompt diff --git a/Functions/Misc/zcalc b/Functions/Misc/zcalc index 17700e48b..857007a94 100644 --- a/Functions/Misc/zcalc +++ b/Functions/Misc/zcalc @@ -114,7 +114,9 @@ forms=( '%2$g' '%.*g' '%.*f' '%.*E' '') zmodload -i zsh/mathfunc 2>/dev/null autoload -Uz zmathfuncdef -: ${ZCALCPROMPT="%1v> "} +if (( ! ${+ZCALCPROMPT} )); then + typeset -g ZCALCPROMPT="%1v> " +fi # Supply some constants. float PI E -- cgit 1.4.1