From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 12 Mar 2016 18:23:00 +0000 (+0100)
Subject: patch 7.4.1547
X-Git-Tag: v7.4.1547
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=385111bd86e0b38667879c3e89506ca1ae98e1df;p=vim

patch 7.4.1547
Problem:    Getting a cterm highlight attribute that is not set results in the
            string "-1".
Solution:   Return an empty string. (Taro Muraoka)
---

diff --git a/src/syntax.c b/src/syntax.c
index e37dacb8f..ac80ab4e7 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -8999,6 +8999,8 @@ highlight_color(
 	    n = HL_TABLE()[id - 1].sg_cterm_fg - 1;
 	else
 	    n = HL_TABLE()[id - 1].sg_cterm_bg - 1;
+	if (n < 0)
+	    return NULL;
 	sprintf((char *)name, "%d", n);
 	return name;
     }
diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim
index 607175690..a1d819d82 100644
--- a/src/testdir/test_alot.vim
+++ b/src/testdir/test_alot.vim
@@ -16,5 +16,6 @@ source test_reltime.vim
 source test_searchpos.vim
 source test_set.vim
 source test_sort.vim
+source test_syn_attr.vim
 source test_undolevels.vim
 source test_unlet.vim
diff --git a/src/testdir/test_syn_attr.vim b/src/testdir/test_syn_attr.vim
new file mode 100644
index 000000000..20e9b17c4
--- /dev/null
+++ b/src/testdir/test_syn_attr.vim
@@ -0,0 +1,31 @@
+" Test syntax highlighting functions.
+
+func Test_missing_attr()
+  hi Mine term=bold cterm=italic
+  call assert_equal('Mine', synIDattr(hlID("Mine"), "name"))
+  call assert_equal('', synIDattr(hlID("Mine"), "bg", 'term'))
+  call assert_equal('1', synIDattr(hlID("Mine"), "bold", 'term'))
+  call assert_equal('1', synIDattr(hlID("Mine"), "italic", 'cterm'))
+  hi Mine term=reverse cterm=inverse
+  call assert_equal('1', synIDattr(hlID("Mine"), "reverse", 'term'))
+  call assert_equal('1', synIDattr(hlID("Mine"), "inverse", 'cterm'))
+  hi Mine term=underline cterm=standout gui=undercurl
+  call assert_equal('1', synIDattr(hlID("Mine"), "underline", 'term'))
+  call assert_equal('1', synIDattr(hlID("Mine"), "standout", 'cterm'))
+  call assert_equal('1', synIDattr(hlID("Mine"), "undercurl", 'gui'))
+  hi Mine term=NONE cterm=NONE gui=NONE
+  call assert_equal('', synIDattr(hlID("Mine"), "bold", 'term'))
+  call assert_equal('', synIDattr(hlID("Mine"), "italic", 'cterm'))
+  call assert_equal('', synIDattr(hlID("Mine"), "reverse", 'term'))
+  call assert_equal('', synIDattr(hlID("Mine"), "inverse", 'cterm'))
+  call assert_equal('', synIDattr(hlID("Mine"), "underline", 'term'))
+  call assert_equal('', synIDattr(hlID("Mine"), "standout", 'cterm'))
+  call assert_equal('', synIDattr(hlID("Mine"), "undercurl", 'gui'))
+
+  if has('gui')
+    hi Mine guifg=blue guibg=red font=something
+    call assert_equal('blue', synIDattr(hlID("Mine"), "fg", 'gui'))
+    call assert_equal('red', synIDattr(hlID("Mine"), "bg", 'gui'))
+    call assert_equal('something', synIDattr(hlID("Mine"), "font", 'gui'))
+  endif
+endfunc
diff --git a/src/version.c b/src/version.c
index fc9cebea1..c2ba5535f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1547,
 /**/
     1546,
 /**/