diff options
| author | KillTheMule <KillTheMule@users.noreply.github.com> | 2016-05-03 21:10:30 +0200 |
|---|---|---|
| committer | KillTheMule <KillTheMule@users.noreply.github.com> | 2016-05-03 21:13:41 +0200 |
| commit | 9d1c52239a949adc681614e8ad8ec194d9a85408 (patch) | |
| tree | d53a6cd179a9b55a590d00f457b86dc188a7dc21 /runtime/ftplugin | |
| parent | 95d376dc88934c7aed5db08ab481037b848b5126 (diff) | |
| download | rneovim-9d1c52239a949adc681614e8ad8ec194d9a85408.tar.gz rneovim-9d1c52239a949adc681614e8ad8ec194d9a85408.tar.bz2 rneovim-9d1c52239a949adc681614e8ad8ec194d9a85408.zip | |
vim-patch:d042dc8
Update runtime files.
https://github.com/vim/vim/commit/d042dc825c9b97dacd84d4728f88300da4d5b6b9
Missing in runtime/doc: hangulin.txt, tags, todo.txt. The changes to options.txt
do not apply for nvim. man.vim is very different in nvim, some changes applied
manually, others discarded.
Diffstat (limited to 'runtime/ftplugin')
| -rw-r--r-- | runtime/ftplugin/changelog.vim | 12 | ||||
| -rw-r--r-- | runtime/ftplugin/man.vim | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/runtime/ftplugin/changelog.vim b/runtime/ftplugin/changelog.vim index 244245e271..257e9cd9d4 100644 --- a/runtime/ftplugin/changelog.vim +++ b/runtime/ftplugin/changelog.vim @@ -1,7 +1,8 @@ " Vim filetype plugin file -" Language: generic Changelog file -" Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2014-01-10 +" Language: generic Changelog file +" Maintainer: Martin Florian <marfl@posteo.de> +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2015-10-25 " Variables: " g:changelog_timeformat (deprecated: use g:changelog_dateformat instead) - " description: the timeformat used in ChangeLog entries. @@ -167,7 +168,7 @@ if &filetype == 'changelog' let cursor = stridx(line, '{cursor}') call setline(lnum, substitute(line, '{cursor}', '', '')) endif - startinsert! + startinsert endfunction " Internal function to create a new entry in the ChangeLog. @@ -223,7 +224,8 @@ if &filetype == 'changelog' endfunction if exists(":NewChangelogEntry") != 2 - noremap <buffer> <silent> <Leader>o <Esc>:call <SID>new_changelog_entry('')<CR> + nnoremap <buffer> <silent> <Leader>o :<C-u>call <SID>new_changelog_entry('')<CR> + xnoremap <buffer> <silent> <Leader>o :<C-u>call <SID>new_changelog_entry('')<CR> command! -nargs=0 NewChangelogEntry call s:new_changelog_entry('') endif diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim index 36cd70f203..04ab539fb1 100644 --- a/runtime/ftplugin/man.vim +++ b/runtime/ftplugin/man.vim @@ -32,6 +32,10 @@ if !exists("g:no_plugin_maps") && !exists("g:no_man_maps") endif endif +if exists('g:ft_man_folding_enable') && (g:ft_man_folding_enable == 1) + setlocal foldmethod=indent foldnestmax=1 foldenable +endif + let b:undo_ftplugin = 'setlocal iskeyword<' " vim: set sw=2: |