aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-10-17 00:31:43 +0200
committerJustin M. Keyes <justinkz@gmail.com>2018-02-23 00:48:35 +0100
commit0c930c2969a8c7cce49382d0acb83e165644af41 (patch)
tree607a1a57c8777a449e8d5d892e544efc79e5a2eb
parent15670ca1ad657945f69350b663e127f71f81d51c (diff)
downloadrneovim-0c930c2969a8c7cce49382d0acb83e165644af41.tar.gz
rneovim-0c930c2969a8c7cce49382d0acb83e165644af41.tar.bz2
rneovim-0c930c2969a8c7cce49382d0acb83e165644af41.zip
defaults: 'fillchars'
Most fonts should have these by now. Both are a significant visual improvement. - Vertical connecting bar `│` is used by tmux, pstree, Windows 7 cmd.exe and nvim-qt.exe. - Middle dot `·` works on Windows 7 cmd.exe, nvim-qt.exe. For reference: tmux uses these chars to draw lines: │ ├ ─
-rw-r--r--runtime/doc/options.txt8
-rw-r--r--runtime/doc/vim_diff.txt1
-rw-r--r--src/nvim/globals.h4
-rw-r--r--src/nvim/options.lua2
-rw-r--r--src/nvim/screen.c2
5 files changed, 9 insertions, 8 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index a1a361fc85..0345960b0d 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2377,7 +2377,7 @@ A jump table for the options with a short description can be found at |Q_op|.
Only normal file name characters can be used, "/\*?[|<>" are illegal.
*'fillchars'* *'fcs'*
-'fillchars' 'fcs' string (default "vert:|,fold:-")
+'fillchars' 'fcs' string (default "vert:│,fold:·")
global
{not available when compiled without the |+windows|
and |+folding| features}
@@ -2387,8 +2387,8 @@ A jump table for the options with a short description can be found at |Q_op|.
item default Used for ~
stl:c ' ' or '^' statusline of the current window
stlnc:c ' ' or '=' statusline of the non-current windows
- vert:c '|' vertical separators |:vsplit|
- fold:c '-' filling 'foldtext'
+ vert:c '│' vertical separators |:vsplit|
+ fold:c '·' filling 'foldtext'
diff:c '-' deleted lines of the 'diff' option
Any one that is omitted will fall back to the default. For "stl" and
@@ -2396,7 +2396,7 @@ A jump table for the options with a short description can be found at |Q_op|.
otherwise.
Example: >
- :set fillchars=stl:^,stlnc:=,vert:\|,fold:-,diff:-
+ :set fillchars=stl:^,stlnc:=,vert:│,fold:·,diff:-
< This is similar to the default, except that these characters will also
be used when there is highlighting.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 7426cd0940..3924dd4ebe 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -35,6 +35,7 @@ a complete and centralized reference of those differences.
- 'cscopeverbose' is enabled
- 'directory' defaults to ~/.local/share/nvim/swap// (|xdg|), auto-created
- 'display' defaults to "lastline"
+- 'fillchars' defaults (in effect) to "vert:│,fold:·"
- 'formatoptions' defaults to "tcqj"
- 'history' defaults to 10000 (the maximum)
- 'hlsearch' is set by default
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index 3df201b6bf..3254ddfbd7 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -951,8 +951,8 @@ EXTERN int lcs_conceal INIT(= ' ');
/* Characters from 'fillchars' option */
EXTERN int fill_stl INIT(= ' ');
EXTERN int fill_stlnc INIT(= ' ');
-EXTERN int fill_vert INIT(= ' ');
-EXTERN int fill_fold INIT(= '-');
+EXTERN int fill_vert INIT(= 9474); // │
+EXTERN int fill_fold INIT(= 183); // ·
EXTERN int fill_diff INIT(= '-');
/* Whether 'keymodel' contains "stopsel" and "startsel". */
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 6e8100594d..e0df8eae07 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -812,7 +812,7 @@ return {
vi_def=true,
redraw={'all_windows'},
varname='p_fcs',
- defaults={if_true={vi="vert:|,fold:-"}}
+ defaults={if_true={vi="vert:│,fold:·"}}
},
{
full_name='fixendofline', abbreviation='fixeol',
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 2b4317fd49..0b79f8584f 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -7089,7 +7089,7 @@ static int fillchar_vsep(win_T *wp, int *attr)
{
*attr = win_hl_attr(wp, HLF_C);
if (*attr == 0 && fill_vert == ' ') {
- return '|';
+ return 9474; // default: "│"
} else {
return fill_vert;
}