Fix conflicts in ChangeLog

ChangeLog

@@ -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-

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

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 "$@"

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:
 #

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

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)