diff options
author | Josh Rahm <joshuarahm@gmail.com> | 2023-11-29 22:40:31 +0000 |
---|---|---|
committer | Josh Rahm <joshuarahm@gmail.com> | 2023-11-29 22:40:31 +0000 |
commit | 339e2d15cc26fe86988ea06468d912a46c8d6f29 (patch) | |
tree | a6167fc8fcfc6ae2dc102f57b2473858eac34063 /src/nvim/mark.h | |
parent | 067dc73729267c0262438a6fdd66e586f8496946 (diff) | |
parent | 4a8bf24ac690004aedf5540fa440e788459e5e34 (diff) | |
download | rneovim-339e2d15cc26fe86988ea06468d912a46c8d6f29.tar.gz rneovim-339e2d15cc26fe86988ea06468d912a46c8d6f29.tar.bz2 rneovim-339e2d15cc26fe86988ea06468d912a46c8d6f29.zip |
Merge remote-tracking branch 'upstream/master' into fix_repeatcmdline
Diffstat (limited to 'src/nvim/mark.h')
-rw-r--r-- | src/nvim/mark.h | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/nvim/mark.h b/src/nvim/mark.h index af0abba864..3237ae541e 100644 --- a/src/nvim/mark.h +++ b/src/nvim/mark.h @@ -1,19 +1,18 @@ -#ifndef NVIM_MARK_H -#define NVIM_MARK_H +#pragma once #include <stdbool.h> #include <stddef.h> -#include "nvim/ascii.h" +#include "nvim/ascii_defs.h" #include "nvim/buffer_defs.h" #include "nvim/ex_cmds_defs.h" #include "nvim/extmark_defs.h" #include "nvim/func_attr.h" -#include "nvim/macros.h" -#include "nvim/mark_defs.h" +#include "nvim/macros_defs.h" +#include "nvim/mark_defs.h" // IWYU pragma: export #include "nvim/memory.h" #include "nvim/os/time.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" /// Set fmark using given value #define SET_FMARK(fmarkp_, mark_, fnum_, view_) \ @@ -34,10 +33,6 @@ SET_FMARK(fmarkp___, mark_, fnum_, view_); \ } while (0) -/// Clear given fmark -#define CLEAR_FMARK(fmarkp_) \ - 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_, view_, fname_) \ do { \ @@ -125,4 +120,3 @@ static inline void clearpos(pos_T *a) #ifdef INCLUDE_GENERATED_DECLARATIONS # include "mark.h.generated.h" #endif -#endif // NVIM_MARK_H |