diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2014-05-27 16:51:52 -0400 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2014-05-27 16:52:01 -0400 |
commit | dcc2b25529e3e6cdd89bf7ed19e24d6a73a2e8c3 (patch) | |
tree | bcf0f4d7be21ac0055aa1c091e96caca44046d6e /src/nvim/ops.h | |
parent | 1b43e5c47e3887696d53573fba7fce6221888794 (diff) | |
parent | 753401ab4cea8fc81731403fe587558e36e7388f (diff) | |
download | rneovim-dcc2b25529e3e6cdd89bf7ed19e24d6a73a2e8c3.tar.gz rneovim-dcc2b25529e3e6cdd89bf7ed19e24d6a73a2e8c3.tar.bz2 rneovim-dcc2b25529e3e6cdd89bf7ed19e24d6a73a2e8c3.zip |
Merge #756 'vim-patch:7.4.267'
Diffstat (limited to 'src/nvim/ops.h')
-rw-r--r-- | src/nvim/ops.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/ops.h b/src/nvim/ops.h index 83175eb89d..12dd8351d5 100644 --- a/src/nvim/ops.h +++ b/src/nvim/ops.h @@ -40,8 +40,11 @@ void adjust_cursor_eol(void); int preprocs_left(void); int get_register_name(int num); void ex_display(exarg_T *eap); -int do_join(long count, int insert_space, int save_undo, - int use_formatoptions); +int do_join(long count, + int insert_space, + int save_undo, + int use_formatoptions, + bool setmark); void op_format(oparg_T *oap, int keep_cursor); void op_formatexpr(oparg_T *oap); int fex_format(linenr_T lnum, long count, int c); |