aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

updated for version 7.3.541

Browse Source 
Problem:    When joining lines comment leaders need to be removed manually.
Solution:   Add the 'j' flag to 'formatoptions'. (Lech Lorens)
This commit is contained in:
Bram Moolenaar
2012-06-06 16:12:59 +02:00
parent bc256d91ea
commit 8134039744
13 changed files with 482 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/normal.c
View File

@@ -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);
}
}
}