From 694aee4c3dbc657b8ac05e035cae33fdf49130a2 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Wed, 25 Nov 2015 01:45:45 +0000
Subject: 37214: 'prompt walters': Don't export PS1

---
 Functions/Prompts/prompt_walters_setup | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Functions')

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 v1.2.3


From 8efa4b4088a9f57903954a12eb086b176109bd91 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@zsh.org>
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(-)

(limited to 'Functions')

diff --git a/ChangeLog b/ChangeLog
index b921f63c3..3b010f073 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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
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 v1.2.3