Mercurial > vim
comparison src/drawline.c @ 18364:ee489bb09ea8 v8.1.2176
patch 8.1.2176: syntax attributes not combined with Visual highlighting
Commit: https://github.com/vim/vim/commit/8459006af5e78bd0bd6dcfc6d54ddac35a91ee1c
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Oct 18 23:12:20 2019 +0200
patch 8.1.2176: syntax attributes not combined with Visual highlighting
Problem: Syntax attributes not combined with Visual highlighting. (Arseny
Nasokin)
Solution: Combine the attributes. (closes #5083)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 18 Oct 2019 23:15:03 +0200 |
| parents | 596a04c49d76 |
| children | 86c00b8fefea |
comparison
equal
deleted
inserted
replaced
| 18363:583912a06e4d | 18364:ee489bb09ea8 |
|---|---|
| 1468 | 1468 |
| 1469 // Decide which of the highlight attributes to use. | 1469 // Decide which of the highlight attributes to use. |
| 1470 attr_pri = TRUE; | 1470 attr_pri = TRUE; |
| 1471 #ifdef LINE_ATTR | 1471 #ifdef LINE_ATTR |
| 1472 if (area_attr != 0) | 1472 if (area_attr != 0) |
| 1473 { | |
| 1473 char_attr = hl_combine_attr(line_attr, area_attr); | 1474 char_attr = hl_combine_attr(line_attr, area_attr); |
| 1475 # ifdef FEAT_SYN_HL | |
| 1476 if (syntax_attr != 0) | |
| 1477 char_attr = hl_combine_attr(syntax_attr, char_attr); | |
| 1478 # endif | |
| 1479 } | |
| 1474 else if (search_attr != 0) | 1480 else if (search_attr != 0) |
| 1481 { | |
| 1475 char_attr = hl_combine_attr(line_attr, search_attr); | 1482 char_attr = hl_combine_attr(line_attr, search_attr); |
| 1483 # ifdef FEAT_SYN_HL | |
| 1484 if (syntax_attr != 0) | |
| 1485 char_attr = hl_combine_attr(syntax_attr, char_attr); | |
| 1486 # endif | |
| 1487 } | |
| 1476 # ifdef FEAT_TEXT_PROP | 1488 # ifdef FEAT_TEXT_PROP |
| 1477 else if (text_prop_type != NULL) | 1489 else if (text_prop_type != NULL) |
| 1478 { | 1490 { |
| 1479 char_attr = hl_combine_attr(line_attr != 0 | 1491 char_attr = hl_combine_attr(line_attr != 0 |
| 1480 ? line_attr | 1492 ? line_attr |