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

* upstream/master:
  Follow-up to 28d7056a7a: Fix test expectations.
This commit is contained in:
Daniel Shahaf 2016-10-22 19:46:46 +00:00
commit b4d882dd59
2 changed files with 4 additions and 3 deletions

View file

@ -76,7 +76,7 @@ in this area.
(b4537a972eed, bccc3dc26943) (b4537a972eed, bccc3dc26943)
- Escaped history expansions inside double quotes: `: "\!"` - Escaped history expansions inside double quotes: `: "\!"`
(28d7056a7a06) (28d7056a7a06, et seq)
## Fixed highlighting of: ## Fixed highlighting of:

View file

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