mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-15 14:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.178

Browse Source 
Problem:    The J command does not update '[ and '] marks. (William Gardner)
Solution:   Set the marks. (Christian Brabandt)

https://code.google.com/p/vim/source/detail?r=647e6bb15aa3f864eaf447fe77e3e3ae7e37b134
This commit is contained in:
oni-link
2014-04-03 13:37:06 +02:00
committed by Thiago de Arruda
parent a02bcc0d2f
commit 461b939b01
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ops.c
View File

@@ -3528,6 +3528,11 @@ int do_join(long count, int insert_space, int save_undo, int use_formatoptions)
*/ */
for (t = 0; t < count; ++t) { for (t = 0; t < count; ++t) {
curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t)); curr = curr_start = ml_get((linenr_T)(curwin->w_cursor.lnum + t));
if (t == 0) {
// Set the '[ mark.
curwin->w_buffer->b_op_start.lnum = curwin->w_cursor.lnum;
curwin->w_buffer->b_op_start.col = (colnr_T)STRLEN(curr);
}
if (remove_comments) { if (remove_comments) {
/* We don't want to remove the comment leader if the /* We don't want to remove the comment leader if the
* previous line is not a comment. */ * previous line is not a comment. */
@@ -3623,6 +3628,10 @@ int do_join(long count, int insert_space, int save_undo, int use_formatoptions)
} }
ml_replace(curwin->w_cursor.lnum, newp, FALSE); ml_replace(curwin->w_cursor.lnum, newp, FALSE);
// Set the '] mark.
curwin->w_buffer->b_op_end.lnum = curwin->w_cursor.lnum;
curwin->w_buffer->b_op_end.col = (colnr_T)STRLEN(newp);
/* Only report the change in the first line here, del_lines() will report /* Only report the change in the first line here, del_lines() will report
* the deleted line. */ * the deleted line. */
changed_lines(curwin->w_cursor.lnum, currsize, changed_lines(curwin->w_cursor.lnum, currsize,

5
src/version.c
View File

@@ -202,6 +202,11 @@ static char *(features[]) = {
static int included_patches[] = { static int included_patches[] = {
// Add new patch number below this line // Add new patch number below this line
178,
//177,
//176,
//175,
//174,
173, 173,
172, 172,
171, 171,