diff options
| author | Josh Rahm <rahm@google.com> | 2022-07-18 19:37:18 +0000 |
|---|---|---|
| committer | Josh Rahm <rahm@google.com> | 2022-07-18 19:37:18 +0000 |
| commit | 308e1940dcd64aa6c344c403d4f9e0dda58d9c5c (patch) | |
| tree | 35fe43e01755e0f312650667004487a44d6b7941 /src/nvim/mark.h | |
| parent | 96a00c7c588b2f38a2424aeeb4ea3581d370bf2d (diff) | |
| parent | e8c94697bcbe23a5c7b07c292b90a6b70aadfa87 (diff) | |
| download | rneovim-308e1940dcd64aa6c344c403d4f9e0dda58d9c5c.tar.gz rneovim-308e1940dcd64aa6c344c403d4f9e0dda58d9c5c.tar.bz2 rneovim-308e1940dcd64aa6c344c403d4f9e0dda58d9c5c.zip | |
Merge remote-tracking branch 'upstream/master' into rahm
Diffstat (limited to 'src/nvim/mark.h')
| -rw-r--r-- | src/nvim/mark.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/nvim/mark.h b/src/nvim/mark.h index a55f733d9a..6da976e8d3 100644 --- a/src/nvim/mark.h +++ b/src/nvim/mark.h @@ -13,42 +13,43 @@ #include "nvim/pos.h" /// Set fmark using given value -#define SET_FMARK(fmarkp_, mark_, fnum_) \ +#define SET_FMARK(fmarkp_, mark_, fnum_, view_) \ do { \ fmark_T *const fmarkp__ = fmarkp_; \ fmarkp__->mark = mark_; \ fmarkp__->fnum = fnum_; \ fmarkp__->timestamp = os_time(); \ + fmarkp__->view = view_; \ fmarkp__->additional_data = NULL; \ } while (0) /// Free and set fmark using given value -#define RESET_FMARK(fmarkp_, mark_, fnum_) \ +#define RESET_FMARK(fmarkp_, mark_, fnum_, view_) \ do { \ fmark_T *const fmarkp___ = fmarkp_; \ free_fmark(*fmarkp___); \ - SET_FMARK(fmarkp___, mark_, fnum_); \ + SET_FMARK(fmarkp___, mark_, fnum_, view_); \ } while (0) /// Clear given fmark #define CLEAR_FMARK(fmarkp_) \ - RESET_FMARK(fmarkp_, ((pos_T) { 0, 0, 0 }), 0) + RESET_FMARK(fmarkp_, ((pos_T) { 0, 0, 0 }), 0, ((fmarkv_T) { 0 })) /// Set given extended mark (regular mark + file name) -#define SET_XFMARK(xfmarkp_, mark_, fnum_, fname_) \ +#define SET_XFMARK(xfmarkp_, mark_, fnum_, view_, fname_) \ do { \ xfmark_T *const xfmarkp__ = xfmarkp_; \ xfmarkp__->fname = fname_; \ - SET_FMARK(&(xfmarkp__->fmark), mark_, fnum_); \ + SET_FMARK(&(xfmarkp__->fmark), mark_, fnum_, view_); \ } while (0) /// Free and set given extended mark (regular mark + file name) -#define RESET_XFMARK(xfmarkp_, mark_, fnum_, fname_) \ +#define RESET_XFMARK(xfmarkp_, mark_, fnum_, view_, fname_) \ do { \ xfmark_T *const xfmarkp__ = xfmarkp_; \ free_xfmark(*xfmarkp__); \ xfmarkp__->fname = fname_; \ - SET_FMARK(&(xfmarkp__->fmark), mark_, fnum_); \ + SET_FMARK(&(xfmarkp__->fmark), mark_, fnum_, view_); \ } while (0) /// Convert mark name to the offset |