summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2000-05-24 17:20:26 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2000-05-24 17:20:26 +0000
commit9121d78354d0578333e4f64ac6fa96710e0bf118 (patch)
tree566bff997fcabff1143b26d1f6fe28f1ee45e3e3
parent8fd4ecc3464651e7aca9f57ee42799b40ed3ec39 (diff)
downloadzsh-9121d78354d0578333e4f64ac6fa96710e0bf118.tar.gz
zsh-9121d78354d0578333e4f64ac6fa96710e0bf118.tar.xz
zsh-9121d78354d0578333e4f64ac6fa96710e0bf118.zip
11561: no RC_QUOTES in $'..'
-rw-r--r--ChangeLog3
-rw-r--r--Doc/Zsh/options.yo4
-rw-r--r--Src/lex.c2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4df169c8b..a0bc00a29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-05-24  Peter Stephenson  <pws@cambridgesiliconradio.com>
 
+	* 11561: Src/lex.c, Doc/Zsh/expn.yo: don't use RC_QUOTES in Posix
+	$'...' quoting.
+
 	* 11560: Doc/Zsh/expn.yo: pipes are pipes even if plumbing isn't.
 
 2000-05-24  Bart Schaefer  <schaefer@zsh.org>
diff --git a/Doc/Zsh/options.yo b/Doc/Zsh/options.yo
index fd32c1572..3b61a6871 100644
--- a/Doc/Zsh/options.yo
+++ b/Doc/Zsh/options.yo
@@ -917,7 +917,9 @@ cindex(rc, quoting style)
 cindex(quoting style, rc)
 item(tt(RC_QUOTES))(
 Allow the character sequence `tt('')' to signify a single quote
-within singly quoted strings.
+within singly quoted strings.  Note this does not apply in quoted strings
+using the format tt($')var(...)tt('), where a backslashed single quote can
+be used.
 )
 pindex(RCS)
 cindex(startup files, sourcing)
diff --git a/Src/lex.c b/Src/lex.c
index 0c16db60c..f5c8d7bdd 100644
--- a/Src/lex.c
+++ b/Src/lex.c
@@ -1190,7 +1190,7 @@ gettokstr(int c, int sub)
 		    goto brk;
 		}
 		e = hgetc();
-		if (e != '\'' || unset(RCQUOTES))
+		if (e != '\'' || unset(RCQUOTES) || strquote)
 		    break;
 		add(c);
 	    }