diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2015-11-27 11:22:49 -0800 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2015-11-27 11:22:49 -0800 |
| commit | c7c51eca164ea2e23c1f10b0e63030e66588f27a (patch) | |
| tree | 15e78786da9562f49ad284e5dad2e190694a885f | |
| parent | 026cb6a8127dfb9a6277ec42cc251ebc77e1300e (diff) | |
| parent | 8efa4b4088a9f57903954a12eb086b176109bd91 (diff) | |
| download | zsh-c7c51eca164ea2e23c1f10b0e63030e66588f27a.tar.gz zsh-c7c51eca164ea2e23c1f10b0e63030e66588f27a.zip | |
Fix conflicts in ChangeLog
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | Completion/Base/Utility/_regex_words | 8 | ||||
| -rw-r--r-- | Completion/Unix/Command/_curl | 7 | ||||
| -rw-r--r-- | Completion/Unix/Type/_urls | 2 | ||||
| -rw-r--r-- | Functions/Misc/zcalc | 4 | ||||
| -rw-r--r-- | Functions/Prompts/prompt_walters_setup | 6 |
6 files changed, 36 insertions, 6 deletions
@@ -7,6 +7,21 @@ problems with inserting a line into B02, instead add a placeholder and substitute for it. +2015-11-27 Peter Stephenson <p.stephenson@samsung.com> + + * unposted: Functions/Misc/zcalc: ZCALCPROMPT created globally. + +2015-11-27 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 37214: Functions/Prompts/prompt_walters_setup: 'prompt + walters': Don't export PS1 + + * 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 + 2015-11-26 Barton E. Schaefer <schaefer@zsh.org> * 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 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: # 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 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) |