annotate src/testdir/test85.ok @ 12068:e1b34958f118 v8.0.0914

patch 8.0.0914: highlight attributes are always combined commit https://github.com/vim/vim/commit/0cd2a94a4030f6bd12eaec44db92db108e33c913 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Aug 12 15:12:30 2017 +0200 patch 8.0.0914: highlight attributes are always combined Problem: Highlight attributes are always combined. Solution: Add the 'nocombine' value to replace attributes instead of combining them. (scauligi, closes #1963)
author Christian Brabandt <cb@256bit.org>
date Sat, 12 Aug 2017 15:15:04 +0200
parents af3a3680fc75
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3452
e070b34fe35e updated for version 7.3.491
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
1 1 changed line 1
e070b34fe35e updated for version 7.3.491
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
2 scalar test OK
e070b34fe35e updated for version 7.3.491
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
3 2 line 2
e070b34fe35e updated for version 7.3.491
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
4 dictionary with list OK
e070b34fe35e updated for version 7.3.491
Bram Moolenaar <bram@vim.org>
parents:
diff changeset
5 circular test OK
4293
af3a3680fc75 updated for version 7.3.896
Bram Moolenaar <bram@vim.org>
parents: 3452
diff changeset
6 [123.0, 'abc', [1, 2, 3], {'a': 1, 'b': 2, 'c': 3}]
af3a3680fc75 updated for version 7.3.896
Bram Moolenaar <bram@vim.org>
parents: 3452
diff changeset
7 {'4': 123.0, '5': 'abc', '6': [1, 2, 3], '7': {'a': 1, 'b': 2, 'c': 3}}