4 files changed, 6 insertions, 5 deletions
diff --git a/Functions/Prompts/prompt_adam2_setup b/Functions/Prompts/prompt_adam2_setup
index 34e504c03..9aa4f75cf 100644
--- a/Functions/Prompts/prompt_adam2_setup
+++ b/Functions/Prompts/prompt_adam2_setup
@@ -4,7 +4,7 @@ prompt_adam2_help () {
   cat <<'EOF'
 This prompt is color-theme-able.  You can invoke it thus:
 
-  prompt adam2 [ simple ] <color1> <color2> <color3>
+  prompt adam2 [ plain ] <color1> <color2> <color3>
 
 where the colors are for the hyphens, current directory, and user@host
 bits respectively.
@@ -70,7 +70,7 @@ prompt_adam2_setup () {
 
   prompt_char="%(!.#.>)"
 
-  precmd () { prompt_adam2_precmd }
+  precmd () { prompt_adam2_precmd; setopt promptsubst }
   preexec () { prompt_adam2_preexec }
 }
 
diff --git a/Functions/Prompts/prompt_fire_setup b/Functions/Prompts/prompt_fire_setup
index bd26dd10a..93f92e590 100644
--- a/Functions/Prompts/prompt_fire_setup
+++ b/Functions/Prompts/prompt_fire_setup
@@ -21,7 +21,7 @@ prompt_fire_setup () {
     PS1=$COLOR1$GRAD1$COLOR2'%n@%m'$COLOR3$GRAD2$COLOR4$GRAD1$COLOR6' %D{%a %b %d} %D{%I:%M:%S%P} '$NONE'$prompt_newline'$COLOR5'%~/'$GRAD0' '
     PS2=$COLOR1$GRAD1$COLOR3$GRAD2$COLOR4$GRAD1$COLOR5'>'$GRAD0' '
 
-  precmd () { }
+  precmd () { setopt promptsubst }
   preexec () { }
 }
 
diff --git a/Functions/Prompts/prompt_redhat_setup b/Functions/Prompts/prompt_redhat_setup
index 2605545fe..876797899 100644
--- a/Functions/Prompts/prompt_redhat_setup
+++ b/Functions/Prompts/prompt_redhat_setup
@@ -6,7 +6,7 @@ prompt_redhat_setup () {
   PS1="[%n@%m %1~]\\$ "
   PS2="> "
 
-  precmd () { }
+  precmd () { setopt promptsubst }
   preexec () { }
 }
 
diff --git a/Functions/Prompts/promptinit b/Functions/Prompts/promptinit
index d4fe30c2f..c3ce4b4fe 100644
--- a/Functions/Prompts/promptinit
+++ b/Functions/Prompts/promptinit
@@ -35,6 +35,7 @@ promptinit () {
 }
 
 prompt () {
+  emulate -L zsh
   local opt preview theme usage old_theme
 
   usage='Usage: prompt <options>
@@ -91,7 +92,7 @@ Options:
          print "$usage"
          return
        fi
-       prompt_$1_setup "$*[2,-1]"
+       prompt_$1_setup $*[2,-1]
        prompt_theme=( $* )
 
        # Avoid screwing up the environment listing