From f164c7a39a279f0f1224f7872486e32ec9ade7c9 Mon Sep 17 00:00:00 2001
From: Curtis McEnroe <june@causal.agency>
Date: Sun, 10 Feb 2019 17:42:47 -0500
Subject: Don't match DQ string inside SQ string

---
 bin/hi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/hi.c b/bin/hi.c
index e7b826f8..d071a876 100644
--- a/bin/hi.c
+++ b/bin/hi.c
@@ -86,7 +86,7 @@ static const struct Syntax CSyntax[] = {
 		.pattern = "include" WS "(<[^>]*>)" },
 	{ String,
 		.pattern = "[LUu]?" PATTERN_SQ },
-	{ String,
+	{ String, .parent = ~SET(String),
 		.pattern = "([LU]|u8?)?" PATTERN_DQ },
 	{ Escape, .parent = SET(String),
 		.pattern = "[\\]([\"'?\\abfnrtv]|[0-7]{1,3}|x[0-9A-Fa-f]+)" },
-- 
cgit 1.4.1

n value='master' selected='selected'>master</option>
</optgroup></select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>dontfiles
</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/src/'>summary</a> <a href='/src/refs/?id=42e6aa7becbbf5bc1e9d9e7b85b4342e71b07336'>refs</a> <a class='active' href='/src/log/home?follow=1'>log</a> <a href='/src/tree/home?id=42e6aa7becbbf5bc1e9d9e7b85b4342e71b07336'>tree</a> <a href='/src/commit/home?id=42e6aa7becbbf5bc1e9d9e7b85b4342e71b07336&amp;follow=1'>commit</a> <a href='/src/diff/home?id=42e6aa7becbbf5bc1e9d9e7b85b4342e71b07336&amp;follow=1'>diff</a></td><td class='form'><form class='right' method='get' action='/src/log/home'>
<input type='hidden' name='id' value='42e6aa7becbbf5bc1e9d9e7b85b4342e71b07336'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=42e6aa7becbbf5bc1e9d9e7b85b4342e71b07336&amp;follow=1'>root</a>/<a href='/src/log/home?id=42e6aa7becbbf5bc1e9d9e7b85b4342e71b07336&amp;follow=1'>home</a> (<a href='/src/log/home?id=42e6aa7becbbf5bc1e9d9e7b85b4342e71b07336'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/home?id=42e6aa7becbbf5bc1e9d9e7b85b4342e71b07336&amp;showmsg=1&amp;follow=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-09-04 23:05:44 -0400'>2018-09-04</span></td><td><a href='/src/commit/bin/glitch.c?id=0f30c2e691ca05d78ca53cae9eaecdc2596c40ed&amp;follow=1'>Add -i invert option to glitch</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-09-02 22:03:31 -0400'>2018-09-02</span></td><td><a href='/src/commit/bin/pngo.c?id=a68441bca195e3ece2ea6d248c1755c82ec44b2b&amp;follow=1'>malloc IDAT chunks in pngo and glitch</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-09-02 17:01:50 -0400'>2018-09-02</span></td><td><a href='/src/commit/gfx/gfxx.c?id=defede1691f51e2078b98e298979a60087708fb0&amp;follow=1'>Use PascalCase for constants in gfx</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-09-02 16:44:14 -0400'>2018-09-02</span></td><td><a href='/src/commit/bin/wake.c?id=cf3f3b186fc5306b090fbb3cd3da9139b22c936b&amp;follow=1'>Use PascalCase for constants</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-09-02 15:37:23 -0400'>2018-09-02</span></td><td><a href='/src/commit/home/.config/nvim/init.vim?id=4ee4b6ee965e37c3a7375d7a296e143faf1faee0&amp;follow=1'>Remove colorcolumn at 100</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-09-02 11:52:58 -0400'>2018-09-02</span></td><td><a href='/src/commit/install.sh?id=9e1bed8297a7a18baaccdb8b7007d6daaa155457&amp;follow=1'>Install bc(1) on Arch</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-09-02 11:35:20 -0400'>2018-09-02</span></td><td><a href='/src/commit/home/.ssh/config?id=abe183b55a2d64c1988f1238b210bf9eb7f83c55&amp;follow=1'>SendEnv LANG</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-08-27 14:00:06 -0400'>2018-08-27</span></td><td><a href='/src/commit/txt/music.md?id=1873bad6008af65863d7639a1247c1181e3282f7&amp;follow=1'>Add New Order — Temptation</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-08-26 02:05:55 -0400'>2018-08-26</span></td><td><a href='/src/commit/install.sh?id=a67f7248523ec4667f43edef7b93837efffbdadc&amp;follow=1'>Add NetBSD to install.sh</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-08-24 15:37:51 -0400'>2018-08-24</span></td><td><a href='/src/commit/home/.kshrc?id=ff0930a917171afe56545d1163555e32831de2ab&amp;follow=1'>Show hostname in title over SSH</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-08-23 00:15:02 -0400'>2018-08-23</span></td><td><a href='/src/commit/home/.kshrc?id=d974d314e83c6708c106af53ed3a25d7b116c65b&amp;follow=1'>Alias bc='bc -l'</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-08-20 23:29:10 -0400'>2018-08-20</span></td><td><a href='/src/commit/bin/README?id=c34a31e6d603a71812ee428d94ee2b21346a3d33&amp;follow=1'>Update usage of scheme in README</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-08-20 23:24:39 -0400'>2018-08-20</span></td><td><a href='/src/commit/bin/fbclock.c?id=942f7c0a040dd154a8c3b9075baadcec81884748&amp;follow=1'>Use scheme.h in fbatt and fbclock</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-08-20 23:03:54 -0400'>2018-08-20</span></td><td><a href='/src/commit/bin/scheme.c?id=8d2b1669e695a54240a113023ecbe76d35da4f9c&amp;follow=1'>Generate scheme.h</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-08-20 22:34:02 -0400'>2018-08-20</span></td><td><a href='/src/commit/gfx/Makefile?id=2fdda232c62550dd005951e57c27a88c87cabfa7&amp;follow=1'>Add dependencies on gfx.h</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-08-18 18:51:29 -0400'>2018-08-18</span></td><td><a href='/src/commit/txt/music.md?id=314a1b7b98ceac1931a90d59ff0cabb6e24857c0&amp;follow=1'>Add Blondie — Heart of Glass</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-08-18 16:51:49 -0400'>2018-08-18</span></td><td><a href='/src/commit/home/.kshrc?id=dc62f853a5387a51ca357ba55b8dbb7aadd1bd9c&amp;follow=1'>Set FCEDIT=$EDITOR</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-08-18 16:34:23 -0400'>2018-08-18</span></td><td><a href='/src/commit/etc/gitea2mastodon.rb?id=0c4ac55bdbb6e83c5ec80089fb9e0efe0a38496f&amp;follow=1'>Only post commits with bodies to Mastodon</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-08-18 16:24:25 -0400'>2018-08-18</span></td><td><a href='/src/commit/etc/tf/link.sh?id=803f492b0ebb2f80dadbc00edd0b2a6a300a123f&amp;follow=1'>Run tf/cfg link script with /bin/sh</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-08-18 16:24:25 -0400'>2018-08-18</span></td><td><a href='/src/commit/home/.local/bin/up?id=f02be9b5c09179b64dc51933635c71625a9ecb82&amp;follow=1'>Run {,s,t}up with /bin/sh</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-08-18 01:27:16 -0400'>2018-08-18</span></td><td><a href='/src/commit/home/.kshrc?id=7d4bdc2c802f024ed9a9cf8c37dca8e5374b1ca0&amp;follow=1'>Use whence instead of type</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-08-18 01:07:05 -0400'>2018-08-18</span></td><td><a href='/src/commit/home/.kshrc?id=bb79b0116213952fc04cda5a0e7c9a306650b151&amp;follow=1'>Cut off path components until right prompt fits</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-08-17 22:42:37 -0400'>2018-08-17</span></td><td><a href='/src/commit/home/.kshrc?id=dad4d5acb78cb978810937335c96a46f0ab18f74&amp;follow=1'>Add "private" alias to source encrypted file</a></td><td>June McEnroe</td></tr>
<tr><td><span title='2018-08-17 21:54:53 -0400'>2018-08-17</span></td><td><a href='/src/commit/home/.config/nvim/init.vim?id=4d44bff605c600dbc032cb02fea48c75989aeb7a&amp;follow=1'>Add vim mapping to add a #include</a></td><td>June McEnroe