aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/autoload/man.vim5
-rw-r--r--runtime/doc/vim_diff.txt1
2 files changed, 6 insertions, 0 deletions
diff --git a/runtime/autoload/man.vim b/runtime/autoload/man.vim
index 77ccbdf888..7385862c0b 100644
--- a/runtime/autoload/man.vim
+++ b/runtime/autoload/man.vim
@@ -1,5 +1,10 @@
" Maintainer: Anmol Sethi <anmol@aubble.com>
+if exists('s:loaded_man')
+ finish
+endif
+let s:loaded_man = 1
+
let s:find_arg = '-w'
let s:localfile_arg = v:true " Always use -l if possible. #6683
let s:section_arg = '-s'
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 4081f4c239..3b5ba26b02 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -55,6 +55,7 @@ a complete and centralized reference of those differences.
- 'smarttab' is set by default
- 'tabpagemax' defaults to 50
- 'tags' defaults to "./tags;,tags"
+- 'ttimeoutlen' defaults to 50
- 'ttyfast' is always set
- 'undodir' defaults to ~/.local/share/nvim/undo (|xdg|), auto-created
- 'viminfo' includes "!"