This commit is contained in:
Daniel Hahler 2019-06-10 16:26:11 +02:00
parent aa6aa732e9
commit 0e3b9ea74d
21 changed files with 59 additions and 4 deletions

View File

@ -15,6 +15,7 @@
#include "nvim/lua/executor.h" #include "nvim/lua/executor.h"
#include "nvim/vim.h" #include "nvim/vim.h"
#include "nvim/buffer.h" #include "nvim/buffer.h"
#include "nvim/change.h"
#include "nvim/charset.h" #include "nvim/charset.h"
#include "nvim/cursor.h" #include "nvim/cursor.h"
#include "nvim/getchar.h" #include "nvim/getchar.h"

View File

@ -32,6 +32,7 @@
#include "nvim/channel.h" #include "nvim/channel.h"
#include "nvim/vim.h" #include "nvim/vim.h"
#include "nvim/buffer.h" #include "nvim/buffer.h"
#include "nvim/change.h"
#include "nvim/charset.h" #include "nvim/charset.h"
#include "nvim/cursor.h" #include "nvim/cursor.h"
#include "nvim/diff.h" #include "nvim/diff.h"

View File

@ -3,7 +3,33 @@
/// change.c: functions related to changing text /// change.c: functions related to changing text
#include "nvim/vim.h" #include "nvim/assert.h"
#include "nvim/buffer.h"
#include "nvim/buffer_updates.h"
#include "nvim/change.h"
#include "nvim/charset.h"
#include "nvim/cursor.h"
#include "nvim/diff.h"
#include "nvim/edit.h"
#include "nvim/eval.h"
#include "nvim/fileio.h"
#include "nvim/fold.h"
#include "nvim/indent.h"
#include "nvim/indent_c.h"
#include "nvim/mark.h"
#include "nvim/memline.h"
#include "nvim/misc1.h"
#include "nvim/move.h"
#include "nvim/option.h"
#include "nvim/screen.h"
#include "nvim/search.h"
#include "nvim/state.h"
#include "nvim/ui.h"
#include "nvim/undo.h"
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "change.c.generated.h"
#endif
/// If the file is readonly, give a warning message with the first change. /// If the file is readonly, give a warning message with the first change.
/// Don't do this for autocommands. /// Don't do this for autocommands.
@ -510,7 +536,6 @@ void ins_char(int c)
if (buf[0] == 0) { if (buf[0] == 0) {
buf[0] = '\n'; buf[0] = '\n';
} }
ins_char_bytes(buf, n); ins_char_bytes(buf, n);
} }

11
src/nvim/change.h Normal file
View File

@ -0,0 +1,11 @@
#ifndef NVIM_CHANGE_H
#define NVIM_CHANGE_H
#include "nvim/buffer_defs.h" // for buf_T
#include "nvim/pos.h" // for linenr_T
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "change.h.generated.h"
#endif
#endif // NVIM_CHANGE_H

View File

@ -5,6 +5,7 @@
#include <inttypes.h> #include <inttypes.h>
#include "nvim/assert.h" #include "nvim/assert.h"
#include "nvim/change.h"
#include "nvim/cursor.h" #include "nvim/cursor.h"
#include "nvim/charset.h" #include "nvim/charset.h"
#include "nvim/fold.h" #include "nvim/fold.h"

View File

@ -18,6 +18,7 @@
#include "nvim/ascii.h" #include "nvim/ascii.h"
#include "nvim/diff.h" #include "nvim/diff.h"
#include "nvim/buffer.h" #include "nvim/buffer.h"
#include "nvim/change.h"
#include "nvim/charset.h" #include "nvim/charset.h"
#include "nvim/cursor.h" #include "nvim/cursor.h"
#include "nvim/eval.h" #include "nvim/eval.h"

View File

@ -14,6 +14,7 @@
#include "nvim/ascii.h" #include "nvim/ascii.h"
#include "nvim/edit.h" #include "nvim/edit.h"
#include "nvim/buffer.h" #include "nvim/buffer.h"
#include "nvim/change.h"
#include "nvim/charset.h" #include "nvim/charset.h"
#include "nvim/cursor.h" #include "nvim/cursor.h"
#include "nvim/digraph.h" #include "nvim/digraph.h"

View File

@ -24,6 +24,7 @@
#endif #endif
#include "nvim/eval.h" #include "nvim/eval.h"
#include "nvim/buffer.h" #include "nvim/buffer.h"
#include "nvim/change.h"
#include "nvim/channel.h" #include "nvim/channel.h"
#include "nvim/charset.h" #include "nvim/charset.h"
#include "nvim/context.h" #include "nvim/context.h"

View File

@ -20,6 +20,7 @@
#include "nvim/ascii.h" #include "nvim/ascii.h"
#include "nvim/ex_cmds.h" #include "nvim/ex_cmds.h"
#include "nvim/buffer.h" #include "nvim/buffer.h"
#include "nvim/change.h"
#include "nvim/charset.h" #include "nvim/charset.h"
#include "nvim/cursor.h" #include "nvim/cursor.h"
#include "nvim/diff.h" #include "nvim/diff.h"

View File

@ -18,6 +18,7 @@
#endif #endif
#include "nvim/ex_cmds2.h" #include "nvim/ex_cmds2.h"
#include "nvim/buffer.h" #include "nvim/buffer.h"
#include "nvim/change.h"
#include "nvim/charset.h" #include "nvim/charset.h"
#include "nvim/eval.h" #include "nvim/eval.h"
#include "nvim/ex_cmds.h" #include "nvim/ex_cmds.h"

View File

@ -16,6 +16,7 @@
#include "nvim/ascii.h" #include "nvim/ascii.h"
#include "nvim/ex_docmd.h" #include "nvim/ex_docmd.h"
#include "nvim/buffer.h" #include "nvim/buffer.h"
#include "nvim/change.h"
#include "nvim/charset.h" #include "nvim/charset.h"
#include "nvim/cursor.h" #include "nvim/cursor.h"
#include "nvim/diff.h" #include "nvim/diff.h"

View File

@ -15,6 +15,7 @@
#include "nvim/ascii.h" #include "nvim/ascii.h"
#include "nvim/fileio.h" #include "nvim/fileio.h"
#include "nvim/buffer.h" #include "nvim/buffer.h"
#include "nvim/change.h"
#include "nvim/charset.h" #include "nvim/charset.h"
#include "nvim/cursor.h" #include "nvim/cursor.h"
#include "nvim/diff.h" #include "nvim/diff.h"

View File

@ -13,6 +13,7 @@
#include "nvim/vim.h" #include "nvim/vim.h"
#include "nvim/ascii.h" #include "nvim/ascii.h"
#include "nvim/fold.h" #include "nvim/fold.h"
#include "nvim/change.h"
#include "nvim/charset.h" #include "nvim/charset.h"
#include "nvim/cursor.h" #include "nvim/cursor.h"
#include "nvim/diff.h" #include "nvim/diff.h"

View File

@ -7,6 +7,7 @@
#include "nvim/ascii.h" #include "nvim/ascii.h"
#include "nvim/assert.h" #include "nvim/assert.h"
#include "nvim/change.h"
#include "nvim/indent.h" #include "nvim/indent.h"
#include "nvim/eval.h" #include "nvim/eval.h"
#include "nvim/charset.h" #include "nvim/charset.h"

View File

@ -23,6 +23,7 @@
#include "nvim/cursor.h" #include "nvim/cursor.h"
#include "nvim/undo.h" #include "nvim/undo.h"
#include "nvim/ascii.h" #include "nvim/ascii.h"
#include "nvim/change.h"
#ifdef WIN32 #ifdef WIN32
#include "nvim/os/os.h" #include "nvim/os/os.h"

View File

@ -47,6 +47,7 @@
#include "nvim/vim.h" #include "nvim/vim.h"
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/buffer.h" #include "nvim/buffer.h"
#include "nvim/change.h"
#include "nvim/cursor.h" #include "nvim/cursor.h"
#include "nvim/eval.h" #include "nvim/eval.h"
#include "nvim/getchar.h" #include "nvim/getchar.h"
@ -1178,7 +1179,7 @@ void ml_recover(void)
/* Recovering an empty file results in two lines and the first line is /* Recovering an empty file results in two lines and the first line is
* empty. Don't set the modified flag then. */ * empty. Don't set the modified flag then. */
if (!(curbuf->b_ml.ml_line_count == 2 && *ml_get(1) == NUL)) { if (!(curbuf->b_ml.ml_line_count == 2 && *ml_get(1) == NUL)) {
changed_int(); changed_internal();
buf_inc_changedtick(curbuf); buf_inc_changedtick(curbuf);
} }
} else { } else {
@ -1188,7 +1189,7 @@ void ml_recover(void)
i = STRCMP(p, ml_get(idx + lnum)); i = STRCMP(p, ml_get(idx + lnum));
xfree(p); xfree(p);
if (i != 0) { if (i != 0) {
changed_int(); changed_internal();
buf_inc_changedtick(curbuf); buf_inc_changedtick(curbuf);
break; break;
} }

View File

@ -18,6 +18,7 @@
#include "nvim/ascii.h" #include "nvim/ascii.h"
#include "nvim/normal.h" #include "nvim/normal.h"
#include "nvim/buffer.h" #include "nvim/buffer.h"
#include "nvim/change.h"
#include "nvim/charset.h" #include "nvim/charset.h"
#include "nvim/cursor.h" #include "nvim/cursor.h"
#include "nvim/diff.h" #include "nvim/diff.h"

View File

@ -15,6 +15,7 @@
#include "nvim/ascii.h" #include "nvim/ascii.h"
#include "nvim/ops.h" #include "nvim/ops.h"
#include "nvim/buffer.h" #include "nvim/buffer.h"
#include "nvim/change.h"
#include "nvim/charset.h" #include "nvim/charset.h"
#include "nvim/cursor.h" #include "nvim/cursor.h"
#include "nvim/assert.h" #include "nvim/assert.h"

View File

@ -84,6 +84,7 @@
#include "nvim/ascii.h" #include "nvim/ascii.h"
#include "nvim/spell.h" #include "nvim/spell.h"
#include "nvim/buffer.h" #include "nvim/buffer.h"
#include "nvim/change.h"
#include "nvim/charset.h" #include "nvim/charset.h"
#include "nvim/cursor.h" #include "nvim/cursor.h"
#include "nvim/edit.h" #include "nvim/edit.h"

View File

@ -53,6 +53,7 @@
#include "nvim/macros.h" #include "nvim/macros.h"
#include "nvim/mbyte.h" #include "nvim/mbyte.h"
#include "nvim/buffer.h" #include "nvim/buffer.h"
#include "nvim/change.h"
#include "nvim/ascii.h" #include "nvim/ascii.h"
#include "nvim/getchar.h" #include "nvim/getchar.h"
#include "nvim/ui.h" #include "nvim/ui.h"

View File

@ -85,6 +85,7 @@
#include "nvim/buffer.h" #include "nvim/buffer.h"
#include "nvim/ascii.h" #include "nvim/ascii.h"
#include "nvim/change.h"
#include "nvim/undo.h" #include "nvim/undo.h"
#include "nvim/cursor.h" #include "nvim/cursor.h"
#include "nvim/edit.h" #include "nvim/edit.h"