Merge remote-tracking branch 'upstream/master' into 0.5.x

* upstream/master: Follow-up to 28d7056a7a06: Fix test expectations.
2016-10-22 19:46:46 +00:00 · 2016-10-22 19:46:46 +00:00 · b4d882dd59
commit b4d882dd59
parent 2e95ffc08f 035d3eb095
2 changed files with 4 additions and 3 deletions
--- a/changelog.md
+++ b/changelog.md
@ -76,7 +76,7 @@ in this area.
  (b4537a972eed, bccc3dc26943)

 - Escaped history expansions inside double quotes: `: "\!"`
-  (28d7056a7a06)
+  (28d7056a7a06, et seq)


 ## Fixed highlighting of:
--- a/highlighters/main/test-data/history-double-quoted-escaped.zsh
+++ b/highlighters/main/test-data/history-double-quoted-escaped.zsh
@ -32,6 +32,7 @@ BUFFER='echo "Hello\!"'

 expected_region_highlight=(
  '1 4 builtin' # echo
-  '6 14 double-quoted-argument' # "Hello\\\!"
-  '12 13 back-double-quoted-argument' # \\\!
+  '6 11 double-quoted-argument' # "Hello
+  '12 13 back-double-quoted-argument' # \!
+  '14 14 double-quoted-argument' # "Hello\!"
 )