diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2016-10-31 03:50:19 +0100 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2016-11-08 21:20:08 +0100 |
commit | c04ffe866d276d6a6bd9e9c6a8b0dbb71504db7c (patch) | |
tree | 0fca258fbfb83cb871a493916d9dd6e0ef1195c3 /src/nvim/ex_cmds.h | |
parent | e8c0f909626094350be7ee7b524697804da38dc1 (diff) | |
download | rneovim-c04ffe866d276d6a6bd9e9c6a8b0dbb71504db7c.tar.gz rneovim-c04ffe866d276d6a6bd9e9c6a8b0dbb71504db7c.tar.bz2 rneovim-c04ffe866d276d6a6bd9e9c6a8b0dbb71504db7c.zip |
'inccommand': rework
- Eliminate/isolate static/global variables
- Remove special-case parameter from buflist_new()
- Remove special-case ECMD_RESERVED_BUFNR
- To determine when u_undo_and_forget() should be done, check
b_changedtick instead of a heuristic.
- use mb_string2cells() instead of strlen() to measure the :sub patterns
- call ml_close() before buf_clear_file(). Avoids leaks caught by ASan.
Original patch by:
Robin Elrharbi-Fleury (Robinhola)
Audrey Rayé (Adrey06)
Philémon Hullot (DesbyP)
Aymeric Collange (aym7)
Clément Guyomard (Clement0)
Diffstat (limited to 'src/nvim/ex_cmds.h')
-rw-r--r-- | src/nvim/ex_cmds.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/nvim/ex_cmds.h b/src/nvim/ex_cmds.h index 82848528ce..ccb2202edb 100644 --- a/src/nvim/ex_cmds.h +++ b/src/nvim/ex_cmds.h @@ -6,8 +6,6 @@ #include "nvim/os/time.h" #include "nvim/eval_defs.h" #include "nvim/pos.h" -#include "nvim/lib/klist.h" -#include "nvim/lib/kvec.h" // flags for do_ecmd() #define ECMD_HIDE 0x01 // don't free the current buffer @@ -18,6 +16,7 @@ #define ECMD_ADDBUF 0x10 // don't edit, just add to buffer list #define ECMD_RESERVED_BUFNR 0x20 // bufnr argument is reserved bufnr + /* for lnum argument in do_ecmd() */ #define ECMD_LASTL (linenr_T)0 /* use last position in loaded file */ #define ECMD_LAST (linenr_T)-1 /* use last position in all files */ @@ -30,24 +29,6 @@ typedef struct { list_T *additional_elements; ///< Additional data left from ShaDa file. } SubReplacementString; - -// Defs for inc_sub functionality - -/// Structure to backup and display matched lines in incsubstitution -typedef struct { - linenr_T lnum; - long nmatch; - char_u *line; - // list of column numbers of matches on this line - kvec_t(colnr_T) start_col; -} MatchedLine; - -// List of matched lines -typedef kvec_t(MatchedLine) MatchedLineVec; - -// End defs for inc_sub functionality - - #ifdef INCLUDE_GENERATED_DECLARATIONS # include "ex_cmds.h.generated.h" #endif |