22852: users style effect changed in 22191

22853: unquoted ^ at end of bindkey string treated literally

3 files changed, 13 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 8e2c59fc7..af717e8ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-10  Peter Stephenson  <pws@csr.com>
+
+	* 22853: Src/utils.c: unquoted ^ at end of bindkey string
+	treated literally.
+
+	* 22852: Doc/Zsh/compsys.yo: finally document effect of 22191
+	(users style overrides use of userdirs).
+
 2006-10-07  Clint Adams  <clint@zsh.org>
 
 	* 22835: Completion/Unix/Command/_pon: tidy up pon bit
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index f65f15223..ae6238b6c 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -2603,9 +2603,10 @@ extended depending on authorial frustration.
 kindex(users, completion style)
 item(tt(users))(
 This may be set to a list of usernames to be completed.
-If it is not set or the string on the line
-doesn't match any of the strings in this list, all usernames will be
-completed.
+If it is not set all usernames will be completed.
+Note that if it is set only that list of users will be completed;
+this is because on some systems querying all users can take
+a prohibitive amount of time.
 )
 kindex(users-hosts, completion style)
 item(tt(users-hosts))(
diff --git a/Src/utils.c b/Src/utils.c
index 0aa0dfe2f..2e124443f 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -4744,7 +4744,7 @@ getkeystring(char *s, int *len, int how, int *misc)
 	} else if ((how & GETKEY_DOLLAR_QUOTE) && *s == Snull) {
 	    for (u = t; (*u++ = *s++););
 	    return t + 1;
-	} else if (*s == '^' && !control && (how & GETKEY_CTRL)) {
+	} else if (*s == '^' && !control && (how & GETKEY_CTRL) && s[1]) {
 	    control = 1;
 	    continue;
 #ifdef MULTIBYTE_SUPPORT