Merge remote-tracking branch 'upstream/master' into 0.5.x
* upstream/master: Follow-up to 28d7056a7a06: Fix test expectations.
This commit is contained in:
		
						commit
						b4d882dd59
					
				|  | @ -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: | ||||||
|  |  | ||||||
|  | @ -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\!" | ||||||
| ) | ) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue