aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/buffer_defs.h
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-02-15 03:55:23 -0500
committerJustin M. Keyes <justinkz@gmail.com>2016-02-15 03:55:23 -0500
commitbaee9fe286fdcb9b04914feb8ab875c6143c2883 (patch)
treee43970514bd6a60c2c9ddba4852a099e73e9bbce /src/nvim/buffer_defs.h
parent1e995ea2fd37f61ddf5496bfddf49b5ee0a527a8 (diff)
parentb137ebdd17cd3015fdb1123c2c1d9c54f37e8548 (diff)
downloadrneovim-baee9fe286fdcb9b04914feb8ab875c6143c2883.tar.gz
rneovim-baee9fe286fdcb9b04914feb8ab875c6143c2883.tar.bz2
rneovim-baee9fe286fdcb9b04914feb8ab875c6143c2883.zip
Merge pull request #4220 from watiko/vim-7.4.792
vim-patch:7.4.792
Diffstat (limited to 'src/nvim/buffer_defs.h')
-rw-r--r--src/nvim/buffer_defs.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
index 78d9a9484e..709ff3dd0d 100644
--- a/src/nvim/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
@@ -904,13 +904,14 @@ struct posmatch
typedef struct matchitem matchitem_T;
struct matchitem {
matchitem_T *next;
- int id; /* match ID */
- int priority; /* match priority */
- char_u *pattern; /* pattern to highlight */
- int hlg_id; /* highlight group ID */
- regmmatch_T match; /* regexp program for pattern */
- posmatch_T pos; // position matches
- match_T hl; /* struct for doing the actual highlighting */
+ int id; ///< match ID
+ int priority; ///< match priority
+ char_u *pattern; ///< pattern to highlight
+ int hlg_id; ///< highlight group ID
+ regmmatch_T match; ///< regexp program for pattern
+ posmatch_T pos; ///< position matches
+ match_T hl; ///< struct for doing the actual highlighting
+ int conceal_char; ///< cchar for Conceal highlighting
};
/*