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/normal.c | |
| parent | bc256d91eadb8f32d6a5833c1878684d3c75fb2d (diff) | |
| download | vim-8134039744ffa581f7c217df58131b709317c1c8.zip | |
updated for version 7.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/normal.c')
| -rw-r--r-- | src/normal.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/normal.c b/src/normal.c index 3c66a3773..6688a9da8 100644 --- a/src/normal.c +++ b/src/normal.c @@ -1968,7 +1968,7 @@ do_pending_operator(cap, old_col, gui_yank) beep_flush(); else { - (void)do_join(oap->line_count, oap->op_type == OP_JOIN, TRUE); + (void)do_join(oap->line_count, oap->op_type == OP_JOIN, TRUE, TRUE); auto_format(FALSE, TRUE); } break; @@ -4426,7 +4426,7 @@ find_decl(ptr, len, locally, thisblock, searchflags) break; } #ifdef FEAT_COMMENTS - if (get_leader_len(ml_get_curline(), NULL, FALSE) > 0) + if (get_leader_len(ml_get_curline(), NULL, FALSE, TRUE) > 0) { /* Ignore this line, continue at start of next line. */ ++curwin->w_cursor.lnum; @@ -9324,7 +9324,7 @@ nv_join(cap) { prep_redo(cap->oap->regname, cap->count0, NUL, cap->cmdchar, NUL, NUL, cap->nchar); - (void)do_join(cap->count0, cap->nchar == NUL, TRUE); + (void)do_join(cap->count0, cap->nchar == NUL, TRUE, TRUE); } } } |