From 1cac90759a7c43ab08d4f1582379f6f4a08437d1 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Fri, 8 Dec 2006 18:52:04 +0000
Subject: 23036: three more fixes for completion using $'...'

---
 Src/Zle/compcore.c   |  1 +
 Src/Zle/zle_tricky.c | 10 ++++++++++
 2 files changed, 11 insertions(+)

(limited to 'Src/Zle')

diff --git a/Src/Zle/compcore.c b/Src/Zle/compcore.c
index b49fdd5c5..a21b83569 100644
--- a/Src/Zle/compcore.c
+++ b/Src/Zle/compcore.c
@@ -1653,6 +1653,7 @@ set_comp_sep(void)
 	    instring = QT_DOLLARS;
 	    nsptr++;
 	    tsptr++;
+	    swb++;
 	    break;
 	}
 
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
index d678487db..1393027f7 100644
--- a/Src/Zle/zle_tricky.c
+++ b/Src/Zle/zle_tricky.c
@@ -1032,6 +1032,16 @@ static int
 has_real_token(const char *s)
 {
     while (*s) {
+	/*
+	 * Special action required for $' strings, which
+	 * need to be treated like nulls.
+	 */
+	if ((*s == Qstring && s[1] == '\'') ||
+	    (*s == String && s[1] == Snull))
+	{
+	    s += 2;
+	    continue;
+	}
 	if (itok(*s) && !inull(*s))
 	    return 1;
 	s++;
-- 
cgit 1.4.1