diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2018-12-09 23:00:03 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-12-09 23:07:28 +0100 |
| commit | 20620bae76deddd892df2d33f9e745efd5d8598b (patch) | |
| tree | 8c43e2387210e7a561dad08b2cda8e0370f0eb72 /src/nvim/globals.h | |
| parent | 857a7312d015350c9637548310c7a187637d3ca4 (diff) | |
| parent | 4e2981081796c8618caa4bed30d12e1e8fc8ae08 (diff) | |
| download | rneovim-20620bae76deddd892df2d33f9e745efd5d8598b.tar.gz rneovim-20620bae76deddd892df2d33f9e745efd5d8598b.tar.bz2 rneovim-20620bae76deddd892df2d33f9e745efd5d8598b.zip | |
Merge #9306 'vim-patch: integrate xdiff library'
closes #1466
closes #1007
closes #1391
Diffstat (limited to 'src/nvim/globals.h')
| -rw-r--r-- | src/nvim/globals.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nvim/globals.h b/src/nvim/globals.h index df74e8b2ff..04ff1320ce 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -1125,8 +1125,7 @@ EXTERN FILE *time_fd INIT(= NULL); /* where to write startup timing */ * can't do anything useful with the value. Assign to this variable to avoid * the warning. */ -EXTERN int ignored; -EXTERN char *ignoredp; +EXTERN int vim_ignored; // Start a msgpack-rpc channel over stdin/stdout. EXTERN bool embedded_mode INIT(= false); |