diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-06-06 16:12:59 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-06-06 16:12:59 +0200 |
| commit | 8134039744ffa581f7c217df58131b709317c1c8 (patch) | |
| tree | f8fd1cddb2359407b77c3b9a494a27a451e6378c /src/proto | |
| parent | bc256d91eadb8f32d6a5833c1878684d3c75fb2d (diff) | |
| download | vim-git-8134039744ffa581f7c217df58131b709317c1c8.tar.gz | |
updated for version 7.3.541v7.3.541
Problem: When joining lines comment leaders need to be removed manually.
Solution: Add the 'j' flag to 'formatoptions'. (Lech Lorens)
Diffstat (limited to 'src/proto')
| -rw-r--r-- | src/proto/misc1.pro | 3 | ||||
| -rw-r--r-- | src/proto/ops.pro | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/proto/misc1.pro b/src/proto/misc1.pro index 93bfff60d..f646a1cbb 100644 --- a/src/proto/misc1.pro +++ b/src/proto/misc1.pro @@ -6,7 +6,8 @@ int get_indent_str __ARGS((char_u *ptr, int ts)); int set_indent __ARGS((int size, int flags)); int get_number_indent __ARGS((linenr_T lnum)); int open_line __ARGS((int dir, int flags, int old_indent)); -int get_leader_len __ARGS((char_u *line, char_u **flags, int backward)); +int get_leader_len __ARGS((char_u *line, char_u **flags, int backward, int do_skip_space)); +int get_last_leader_offset __ARGS((char_u *line, char_u **flags)); int plines __ARGS((linenr_T lnum)); int plines_win __ARGS((win_T *wp, linenr_T lnum, int winheight)); int plines_nofill __ARGS((linenr_T lnum)); diff --git a/src/proto/ops.pro b/src/proto/ops.pro index d07c260dc..85fb9835d 100644 --- a/src/proto/ops.pro +++ b/src/proto/ops.pro @@ -36,7 +36,7 @@ void adjust_cursor_eol __ARGS((void)); int preprocs_left __ARGS((void)); int get_register_name __ARGS((int num)); void ex_display __ARGS((exarg_T *eap)); -int do_join __ARGS((long count, int insert_space, int save_undo)); +int do_join __ARGS((long count, int insert_space, int save_undo, int use_formatoptions)); void op_format __ARGS((oparg_T *oap, int keep_cursor)); void op_formatexpr __ARGS((oparg_T *oap)); int fex_format __ARGS((linenr_T lnum, long count, int c)); |