diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2023-01-14 23:13:48 -0700 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2023-01-14 23:13:48 -0700 |
| commit | 7a6e249a32f79331bfb5e29bc0cabcf89a026081 (patch) | |
| tree | 27a7354ec18448e4090ac91581534baa7b537254 /src/nvim/message.h | |
| parent | 442d4e54c30b8e193e3f6e4d32b43e96815bccd7 (diff) | |
| parent | 6134c1e8a39a5e61d0593613343a5923a86e3545 (diff) | |
| download | rneovim-7a6e249a32f79331bfb5e29bc0cabcf89a026081.tar.gz rneovim-7a6e249a32f79331bfb5e29bc0cabcf89a026081.tar.bz2 rneovim-7a6e249a32f79331bfb5e29bc0cabcf89a026081.zip | |
Merge remote-tracking branch 'upstream/master' into usermarks
Diffstat (limited to 'src/nvim/message.h')
| -rw-r--r-- | src/nvim/message.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/nvim/message.h b/src/nvim/message.h index 2de2890213..191d3b8da7 100644 --- a/src/nvim/message.h +++ b/src/nvim/message.h @@ -5,15 +5,13 @@ #include <stdbool.h> #include <stddef.h> +#include "klib/kvec.h" #include "nvim/api/private/defs.h" #include "nvim/grid_defs.h" -#include "nvim/lib/kvec.h" #include "nvim/macros.h" #include "nvim/types.h" -/* - * Types of dialogs passed to do_dialog(). - */ +// Types of dialogs passed to do_dialog(). #define VIM_GENERIC 0 #define VIM_ERROR 1 #define VIM_WARNING 2 @@ -21,9 +19,7 @@ #define VIM_QUESTION 4 #define VIM_LAST_TYPE 4 // sentinel value -/* - * Return values for functions like vim_dialogyesno() - */ +// Return values for functions like vim_dialogyesno() #define VIM_YES 2 #define VIM_NO 3 #define VIM_CANCEL 4 @@ -40,7 +36,7 @@ typedef kvec_t(HlMessageChunk) HlMessage; /// Message history for `:messages` typedef struct msg_hist { struct msg_hist *next; ///< Next message. - char_u *msg; ///< Message text. + char *msg; ///< Message text. const char *kind; ///< Message kind (for msg_ext) int attr; ///< Message highlighting. bool multiline; ///< Multiline message. @@ -70,6 +66,8 @@ EXTERN ScreenGrid msg_grid_adj INIT(= SCREEN_GRID_INIT); // value of msg_scrolled at latest msg_scroll_flush. EXTERN int msg_scrolled_at_flush INIT(= 0); +EXTERN int msg_grid_scroll_discount INIT(= 0); + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "message.h.generated.h" #endif |