patch 8.0.1042: without the syntax feature highlighting doesn't work

Problem:    Without the syntax feature highlighting doesn't work.
Solution:   Always use unsigned short to store attributes.

diff --git a/src/version.c b/src/version.c
index e59466762a88810558181d3640fc794403e3bf0e..77620adc3f7a151bab53f999bfbecd3299087208 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1042,
 /**/
     1041,
 /**/

diff --git a/src/vim.h b/src/vim.h
index 77081e202a97759a391e0c8724b8ae69948d4650..93dc951fb3e091ef6a14e0cc4c8d2d95de26ea8c 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -435,13 +435,8 @@ typedef off_t off_T;
  * The characters and attributes cached for the screen.
  */
 typedef char_u schar_T;
-#ifdef FEAT_SYN_HL
 typedef unsigned short sattr_T;
-# define MAX_TYPENR 65535
-#else
-typedef unsigned char sattr_T;
-# define MAX_TYPENR 255
-#endif
+#define MAX_TYPENR 65535
 
 /*
  * The u8char_T can hold one decoded UTF-8 character.