about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Base/Core/_setup2
-rw-r--r--Doc/Zsh/compsys.yo2
-rw-r--r--Doc/Zsh/mod_complist.yo2
4 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6743bcd98..95685b9af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-28  Clint Adams  <clint@zsh.org>
+
+	* 14509: Completion/Base/Core/_setup, Doc/Zsh/compsys.yo,
+	Doc/Zsh/mod_complist.yo: clobber both ZLS_COLORS and ZLS_COLOURS
+	during compinit, and slightly clarify this behavior in the
+	documentation.
+
 2001-05-28  Sven Wischnowsky  <wischnow@zsh.org>
 
 	* 14507: Src/Zle/compresult.c: fix for cursor positioning with
diff --git a/Completion/Base/Core/_setup b/Completion/Base/Core/_setup
index 0eed7b7cb..d85ebb885 100644
--- a/Completion/Base/Core/_setup
+++ b/Completion/Base/Core/_setup
@@ -20,7 +20,7 @@ if zstyle -a ":completion:${curcontext}:$1" list-colors val; then
 #   ZLS_COLORS="$ZLS_COLORS$ZLS_COLOURS"
 
 elif [[ "$1" = default ]]; then
-  unset ZLS_COLORS
+  unset ZLS_COLORS ZLS_COLOURS
 fi
 
 if zstyle -t ":completion:${curcontext}:$1" list-packed; then
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index 0a203a7aa..0180d6a18 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -1483,7 +1483,7 @@ kindex(list-colors, completion style)
 item(tt(list-colors))(
 If the tt(zsh/complist) module is used, this style can be used to set
 color specifications as with the tt(ZLS_COLORS) and tt(ZLS_COLOURS)
-parameters (see
+parameters, which will not be honored under this completion system (see
 ifzman(the section `The zsh/complist Module' in zmanref(zshmodules))\
 ifnzman(noderef(The zsh/complist Module))\
 ).
diff --git a/Doc/Zsh/mod_complist.yo b/Doc/Zsh/mod_complist.yo
index afe95e5ca..cae8cce37 100644
--- a/Doc/Zsh/mod_complist.yo
+++ b/Doc/Zsh/mod_complist.yo
@@ -127,7 +127,7 @@ ifnzman(noderef(Other Functions))\
 `tt($colors[red])' to get the code for foreground color red and
 `tt($colors[bg-green])' for the code for background color green.
 
-If the completion system based around shell functions is used, these
+If the completion system invoked by compinit is used, these
 parameters should not be set directly because the system controls them 
 itself.  Instead, the tt(list-colors) style should be used (see
 ifzman(the section `Completion System Configuration' in zmanref(zshcompsys))\