aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc/vim_diff.txt
diff options
context:
space:
mode:
authorBjörn Linse <bjorn.linse@gmail.com>2016-11-05 18:12:14 +0100
committerGitHub <noreply@github.com>2016-11-05 18:12:14 +0100
commit9147331e212e8d0fff0f30344007faffd42609ee (patch)
tree6d1853a72b94ce19ba0cc163c664a9a206da0091 /runtime/doc/vim_diff.txt
parent32d9c19e294f38a6adae6e055fc606fc3fd33f2f (diff)
parent4ab3fe8eaadb5456eeafc49df2fb0ecf71d836cc (diff)
downloadrneovim-9147331e212e8d0fff0f30344007faffd42609ee.tar.gz
rneovim-9147331e212e8d0fff0f30344007faffd42609ee.tar.bz2
rneovim-9147331e212e8d0fff0f30344007faffd42609ee.zip
Merge pull request #2905 from bfredl/utf8
Only allow encoding=utf-8 and simplify multibyte code
Diffstat (limited to 'runtime/doc/vim_diff.txt')
-rw-r--r--runtime/doc/vim_diff.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index c8919dbe24..590994b7aa 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -40,7 +40,6 @@ these differences.
- 'complete' doesn't include "i"
- 'directory' defaults to ~/.local/share/nvim/swap// (|xdg|), auto-created
- 'display' defaults to "lastline"
-- 'encoding' defaults to "utf-8"
- 'formatoptions' defaults to "tcqj"
- 'history' defaults to 10000 (the maximum)
- 'hlsearch' is set by default
@@ -159,7 +158,7 @@ are always available and may be used simultaneously in separate plugins. The
'p')) mkdir() will silently exit. In Vim this was an error.
3. mkdir() error messages now include strerror() text when mkdir fails.
-'encoding' cannot be changed after startup.
+'encoding' is always "utf-8".
|string()| and |:echo| behaviour changed:
1. No maximum recursion depth limit is applied to nested container
@@ -266,6 +265,7 @@ Highlight groups:
Other options:
'antialias'
'cpoptions' ("g", "w", "H", "*", "-", "j", and all POSIX flags were removed)
+ 'encoding' ("utf-8" is always used)
'guioptions' "t" flag was removed
*'guipty'* (Nvim uses pipes and PTYs consistently on all platforms.)
*'imactivatefunc'* *'imaf'*