From fd0fd752c872428cc4fb9c95721eab1b505fc111 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 2 May 2019 09:56:22 +0200
Subject: terminal: swap priority of terminal, editor highlights

closes #9964
---
 src/nvim/screen.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index cd472ea1e4..d61be4af1c 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -3275,16 +3275,18 @@ win_line (
           line = ml_get_buf(wp->w_buffer, lnum, FALSE);
           ptr = line + v;
 
-          if (!attr_pri)
+          if (!attr_pri) {
             char_attr = syntax_attr;
-          else
+          } else {
             char_attr = hl_combine_attr(syntax_attr, char_attr);
-          /* no concealing past the end of the line, it interferes
-           * with line highlighting */
-          if (c == NUL)
+          }
+          // no concealing past the end of the line, it interferes
+          // with line highlighting.
+          if (c == NUL) {
             syntax_flags = 0;
-          else
+          } else {
             syntax_flags = get_syntax_info(&syntax_seqnr);
+          }
         } else if (!attr_pri) {
           char_attr = 0;
         }
@@ -3376,7 +3378,7 @@ win_line (
         }
 
         if (wp->w_buffer->terminal) {
-          char_attr = hl_combine_attr(char_attr, term_attrs[vcol]);
+          char_attr = hl_combine_attr(term_attrs[vcol], char_attr);
         }
 
         // Found last space before word: check for line break.
-- 
cgit