about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Zsh/Type/_history_modifiers8
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b91e7acf..c25c50dfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-03-19  Peter Stephenson  <pws@csr.com>
 
+	* 26756: Completion/Zsh/Type/_history_modifiers: handling
+	following :s was wrong.
+
 	* 26754: configure.ac, Doc/Zsh/expn.yo, Src/compat.c, Src/hist.c:
 	tweak zgetdir() (but don't use it) and test for realpath().
 
@@ -11448,5 +11451,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4625 $
+* $Revision: 1.4626 $
 *****************************************************
diff --git a/Completion/Zsh/Type/_history_modifiers b/Completion/Zsh/Type/_history_modifiers
index a97e38d20..f8dcd45ae 100644
--- a/Completion/Zsh/Type/_history_modifiers
+++ b/Completion/Zsh/Type/_history_modifiers
@@ -31,11 +31,11 @@ while true; do
       fi
       delim=$PREFIX[1]
       compset -p 1
-      if ! compset "[^$delim]#$delim[^$delim]#$delim"; then
-	if compset "[^$delim]#$delim"; then
-	  _message original string
+      if ! compset -P "[^${delim}]#${delim}[^${delim}]#${delim}"; then
+	if compset -P "[^${delim}]#${delim}"; then
+	  _message "replacement string"
 	else
-	  _message replacement string
+	  _message "original string"
 	fi
 	return
       fi