aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/vim.h
diff options
context:
space:
mode:
authorJosh Rahm <joshuarahm@gmail.com>2022-08-21 23:26:49 -0600
committerJosh Rahm <joshuarahm@gmail.com>2022-08-21 23:26:49 -0600
commit73ede4a508517f8e55c75d710f13851eb8079875 (patch)
treeb4cccc61b70c28b1474d74d2ff4bff856929cdca /src/nvim/vim.h
parent8436383af96dc7afa3596fc22c012d68e76f47f8 (diff)
parent72b03792b6428ca96ca779b53061c6c98f6f930f (diff)
downloadrneovim-73ede4a508517f8e55c75d710f13851eb8079875.tar.gz
rneovim-73ede4a508517f8e55c75d710f13851eb8079875.tar.bz2
rneovim-73ede4a508517f8e55c75d710f13851eb8079875.zip
Merge remote-tracking branch 'upstream/master' into usermarks
Diffstat (limited to 'src/nvim/vim.h')
-rw-r--r--src/nvim/vim.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/vim.h b/src/nvim/vim.h
index 31ac5a67ff..09b949bb20 100644
--- a/src/nvim/vim.h
+++ b/src/nvim/vim.h
@@ -199,6 +199,7 @@ enum { FOLD_TEXT_LEN = 51, }; //!< buffer size for get_foldtext()
// Size in bytes of the hash used in the undo file.
#define UNDO_HASH_SIZE 32
+#define CLEAR_FIELD(field) memset(&(field), 0, sizeof(field))
#define CLEAR_POINTER(ptr) memset((ptr), 0, sizeof(*(ptr)))
// defines to avoid typecasts from (char_u *) to (char *) and back
@@ -274,8 +275,8 @@ enum { FOLD_TEXT_LEN = 51, }; //!< buffer size for get_foldtext()
(const char *)(y), \
(size_t)(n))
-// Enums need a typecast to be used as array index (for Ultrix).
-#define HL_ATTR(n) highlight_attr[(int)(n)]
+// Enums need a typecast to be used as array index.
+#define HL_ATTR(n) hl_attr_active[(int)(n)]
/// Maximum number of bytes in a multi-byte character. It can be one 32-bit
/// character of up to 6 bytes, or one 16-bit character of up to three bytes