diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-12-01 11:56:38 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-12-01 11:56:38 -0500 |
| commit | 826f474ef06e8a406fa398e7ee461457f26a0e8e (patch) | |
| tree | f1bb0385d5e190f7fd1870813ad4ff27f8692f21 /src | |
| parent | 84da3e6bbbea89765c1218a8659304823c7045e0 (diff) | |
| parent | 41523c28e7489e8e9148371ffb5ea95f6f14bc5d (diff) | |
| download | rneovim-826f474ef06e8a406fa398e7ee461457f26a0e8e.tar.gz rneovim-826f474ef06e8a406fa398e7ee461457f26a0e8e.tar.bz2 rneovim-826f474ef06e8a406fa398e7ee461457f26a0e8e.zip | |
Merge pull request #3761 from Shougo/vim-7.4.631
vim-patch:7.4.631
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/globals.h | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/globals.h b/src/nvim/globals.h index d06cf6bfda..52eebebf41 100644 --- a/src/nvim/globals.h +++ b/src/nvim/globals.h @@ -1042,7 +1042,7 @@ EXTERN int lcs_space INIT(= NUL); EXTERN int lcs_tab1 INIT(= NUL); EXTERN int lcs_tab2 INIT(= NUL); EXTERN int lcs_trail INIT(= NUL); -EXTERN int lcs_conceal INIT(= '-'); +EXTERN int lcs_conceal INIT(= ' '); /* Characters from 'fillchars' option */ EXTERN int fill_stl INIT(= ' '); diff --git a/src/nvim/version.c b/src/nvim/version.c index c2a3193344..c9a779b5c8 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -365,7 +365,7 @@ static int included_patches[] = { // 634, 633, // 632 NA - // 631, + 631, 630, 629, // 628, |