summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--Functions/Prompts/prompt_special_chars4
-rw-r--r--Test/Makefile.in1
3 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ebafdae8a..99771bbff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-05-13  Peter Stephenson  <pws@csr.com>
+
+	* users/14118: Functions/Prompts/prompt_special_chars: fix test
+	and assignment.
+
+	* Paul Ackersviller: 26959: Test/Makefile.in: need a delay before
+	removing modules after testing on HP-UX.
+
 2009-05-12  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 26958: Src/prompt.c: Reallocation of prompt line didn't
@@ -11703,5 +11711,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4685 $
+* $Revision: 1.4686 $
 *****************************************************
diff --git a/Functions/Prompts/prompt_special_chars b/Functions/Prompts/prompt_special_chars
index 3dbf481ff..a8da6c3e5 100644
--- a/Functions/Prompts/prompt_special_chars
+++ b/Functions/Prompts/prompt_special_chars
@@ -8,7 +8,7 @@
 
 typeset -gA schars
 
-if [[ ${LC_ALL:-${LC_CTYPE:-$LANG}} = *UTF-8* ]]; then
+if [[ ${LC_ALL:-${LC_CTYPE:-$LANG}} = *(UTF-8|utf8)* ]]; then
   schars[300]=$'\xe2\x94\x94'
   schars[304]=$'\xe2\x94\x8c'
   schars[332]=$'\xe2\x94\x8c'
@@ -20,6 +20,6 @@ if [[ ${LC_ALL:-${LC_CTYPE:-$LANG}} = *UTF-8* ]]; then
   schars[260]=$'\xe2\x96\x91'
 else
   for code in 300 304 332 333 371 372 262 261 260; do
-    eval "char[$code]=\$'\\$code'"
+    eval "schars[$code]=\$'\\$code'"
   done
 fi
diff --git a/Test/Makefile.in b/Test/Makefile.in
index f82516582..083df4942 100644
--- a/Test/Makefile.in
+++ b/Test/Makefile.in
@@ -54,6 +54,7 @@ check test:
 	else \
 	 stat=1; \
 	fi; \
+	sleep 1; \
 	rm -rf Modules .zcompdump; \
 	exit $$stat