GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-16 09:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(textformat): remove unnecessary changed_bytes() (#26027)

Browse Source 
This was removed from Vim in patch 8.1.0681.
This commit is contained in:
zeertzjq
2023-11-13 18:18:04 +08:00
committed by GitHub
parent cbad7f8c21
commit e9bfbe99cd
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/eval/userfunc.h
View File

@ -16,7 +16,7 @@ struct funccal_entry;
// From user function to hashitem and back. // From user function to hashitem and back.
#define UF2HIKEY(fp) ((fp)->uf_name) #define UF2HIKEY(fp) ((fp)->uf_name)
#define HIKEY2UF(p) ((ufunc_T *)(p - offsetof(ufunc_T, uf_name))) #define HIKEY2UF(p) ((ufunc_T *)((p) - offsetof(ufunc_T, uf_name)))
#define HI2UF(hi) HIKEY2UF((hi)->hi_key) #define HI2UF(hi) HIKEY2UF((hi)->hi_key)
// flags used in uf_flags // flags used in uf_flags

6
src/nvim/ops.c
View File

@ -1569,7 +1569,7 @@ int op_delete(oparg_T *oap)
curwin->w_cursor.coladd = 0; curwin->w_cursor.coladd = 0;
} }
// n == number of chars deleted // "n" == number of chars deleted
// If we delete a TAB, it may be replaced by several characters. // If we delete a TAB, it may be replaced by several characters.
// Thus the number of characters may increase! // Thus the number of characters may increase!
n = bd.textlen - bd.startspaces - bd.endspaces; n = bd.textlen - bd.startspaces - bd.endspaces;
@ -4025,8 +4025,9 @@ int do_join(size_t count, int insert_space, int save_undo, int use_formatoptions
comments = xcalloc(count, sizeof(*comments)); comments = xcalloc(count, sizeof(*comments));
} }
// Don't move anything, just compute the final line length // Don't move anything yet, just compute the final line length
// and setup the array of space strings lengths // and setup the array of space strings lengths
// This loops forward over joined lines.
for (t = 0; t < (linenr_T)count; t++) { for (t = 0; t < (linenr_T)count; t++) {
curr_start = ml_get(curwin->w_cursor.lnum + t); curr_start = ml_get(curwin->w_cursor.lnum + t);
curr = curr_start; curr = curr_start;
@ -4107,6 +4108,7 @@ int do_join(size_t count, int insert_space, int save_undo, int use_formatoptions
*cend = 0; *cend = 0;
// Move affected lines to the new long one. // Move affected lines to the new long one.
// This loops backwards over the joined lines, including the original line.
// //
// Move marks from each deleted line to the joined line, adjusting the // Move marks from each deleted line to the joined line, adjusting the
// column. This is not Vi compatible, but Vi deletes the marks, thus that // column. This is not Vi compatible, but Vi deletes the marks, thus that

1
src/nvim/textformat.c
View File

@ -420,7 +420,6 @@ void internal_format(int textwidth, int second_indent, int flags, bool format_on
for (int i = 0; i < padding; i++) { for (int i = 0; i < padding; i++) {
ins_str(" "); ins_str(" ");
} }
changed_bytes(curwin->w_cursor.lnum, leader_len);
} else { } else {
(void)set_indent(second_indent, SIN_CHANGED); (void)set_indent(second_indent, SIN_CHANGED);
} }

2
src/nvim/undo.c
View File

@ -2981,7 +2981,7 @@ void u_clearall(buf_T *buf)
buf->b_u_line_lnum = 0; buf->b_u_line_lnum = 0;
} }
/// save the line "lnum" for the "U" command /// Save the line "lnum" for the "U" command.
void u_saveline(buf_T *buf, linenr_T lnum) void u_saveline(buf_T *buf, linenr_T lnum)
{ {
if (lnum == buf->b_u_line_lnum) { // line is already saved if (lnum == buf->b_u_line_lnum) { // line is already saved