aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
Diffstat (limited to 'runtime')
-rw-r--r--runtime/autoload/tutor.vim9
-rw-r--r--runtime/doc/eval.txt4
-rw-r--r--runtime/doc/options.txt3
-rw-r--r--runtime/ftplugin/tutor.vim3
4 files changed, 5 insertions, 14 deletions
diff --git a/runtime/autoload/tutor.vim b/runtime/autoload/tutor.vim
index 0f01190b9b..3265fdde36 100644
--- a/runtime/autoload/tutor.vim
+++ b/runtime/autoload/tutor.vim
@@ -77,15 +77,6 @@ function! tutor#TutorFolds()
endif
endfunction
-function! tutor#InfoText()
- let l:info_parts = []
- if exists('b:tutor_infofunc')
- call add(l:info_parts, eval(b:tutor_infofunc.'()'))
- endif
- return join(l:info_parts, " ")
-endfunction
-
-
" Marks: {{{1
function! tutor#ApplyMarks()
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index b3ab0a4500..4c0ee6cc66 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2998,8 +2998,8 @@ count({comp}, {expr} [, {ic} [, {start}]]) *count()*
When {ic} is given and it's |TRUE| then case is ignored.
When {comp} is a string then the number of not overlapping
- occurences of {expr} is returned.
-
+ occurrences of {expr} is returned. Zero is returned when
+ {expr} is an empty string.
*cscope_connection()*
cscope_connection([{num} , {dbpath} [, {prepend}]])
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 81726ca46b..cdec599a74 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1960,6 +1960,9 @@ A jump table for the options with a short description can be found at |Q_op|.
vertical Start diff mode with vertical splits (unless
explicitly specified otherwise).
+ hiddenoff Do not use diff mode for a buffer when it
+ becomes hidden.
+
foldcolumn:{n} Set the 'foldcolumn' option to {n} when
starting diff mode. Without this 2 is used.
diff --git a/runtime/ftplugin/tutor.vim b/runtime/ftplugin/tutor.vim
index ec55472b78..30783d9799 100644
--- a/runtime/ftplugin/tutor.vim
+++ b/runtime/ftplugin/tutor.vim
@@ -25,9 +25,6 @@ setlocal foldmethod=manual
setlocal foldexpr=tutor#TutorFolds()
setlocal foldlevel=4
-setlocal statusline=%{toupper(expand('%:t:r'))}\ tutorial%=
-setlocal statusline+=%{tutor#InfoText()}
-
" Load metadata if it exists: {{{1
if filereadable(expand('%').'.json')
call tutor#LoadMetadata()