about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2008-08-07 16:27:15 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2008-08-07 16:27:15 +0000
commitc79ccea7926cff53b5e950f5f252354e7ec3e4e1 (patch)
treee906166b679642d700c6c618362aad95165f3ae1
parent2706eac45492b0fcdfc3cf104ac947e65d09ee25 (diff)
downloadzsh-c79ccea7926cff53b5e950f5f252354e7ec3e4e1.tar.gz
zsh-c79ccea7926cff53b5e950f5f252354e7ec3e4e1.tar.xz
zsh-c79ccea7926cff53b5e950f5f252354e7ec3e4e1.zip
25418: set PROMPT_SUBST for all Bourne-style shells
-rw-r--r--ChangeLog3
-rw-r--r--Doc/Zsh/options.yo2
-rw-r--r--Src/options.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 44c6f64c3..f70a6a258 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-08-07  Peter Stephenson  <pws@csr.com>
 
+	* 25418: Doc/Zsh/options.yo, Src/options.c: set PROMPT_SUBST
+	for all Bourne-style shells.
+
 	* 25415: README, Doc/Zsh/builtins.yo, Doc/Zsh/func.yo,
 	Doc/Zsh/options.yo, Src/builtin.c, Src/exec.c, Src/init.c,
 	Src/options.c, Src/signals.c, Src/zsh.h, Test/A05execution.ztst,
diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo
index a0d1f9c0d..defb9c08c 100644
--- a/Doc/Zsh/options.yo
+++ b/Doc/Zsh/options.yo
@@ -1009,7 +1009,7 @@ See noderef(Prompt Expansion).
 )
 pindex(PROMPT_SUBST)
 cindex(prompt, parameter expansion)
-item(tt(PROMPT_SUBST) <K>)(
+item(tt(PROMPT_SUBST) <K> <S>)(
 If set, em(parameter expansion), em(command substitution) and
 em(arithmetic expansion) are performed in prompts.  Substitutions
 within prompts do not affect the command status.
diff --git a/Src/options.c b/Src/options.c
index d6aa3c850..80e05b343 100644
--- a/Src/options.c
+++ b/Src/options.c
@@ -198,7 +198,7 @@ static struct optname optns[] = {
 {{NULL, "promptcr",	      OPT_ALL},			 PROMPTCR},
 {{NULL, "promptpercent",      OPT_NONBOURNE},		 PROMPTPERCENT},
 {{NULL, "promptsp",	      OPT_ALL},			 PROMPTSP},
-{{NULL, "promptsubst",	      OPT_KSH},			 PROMPTSUBST},
+{{NULL, "promptsubst",	      OPT_BOURNE},		 PROMPTSUBST},
 {{NULL, "pushdignoredups",    OPT_EMULATE},		 PUSHDIGNOREDUPS},
 {{NULL, "pushdminus",	      OPT_EMULATE},		 PUSHDMINUS},
 {{NULL, "pushdsilent",	      0},			 PUSHDSILENT},