aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

patch 8.1.0948: when built without +eval "Vim --clean" produces errors

Browse Source 
Problem:    When built without +eval "Vim --clean" produces errors. (James
            McCoy)
Solution:   Do not enable filetype detection.
This commit is contained in:
Bram Moolenaar 2019-02-18 21:32:28 +01:00
parent 7dca2ebbcf
commit d53931ae73
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
runtime/defaults.vim
View File

@ -1,7 +1,7 @@
" The default vimrc file. " The default vimrc file.
" "
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last change: 2019 Jan 26 " Last change: 2019 Feb 18
" "
" This is loaded if no vimrc file was found. " This is loaded if no vimrc file was found.
" Except when Vim is run with "-u NONE" or "-C". " Except when Vim is run with "-u NONE" or "-C".
@ -90,28 +90,33 @@ if &t_Co > 2 || has("gui_running")
let c_comment_strings=1 let c_comment_strings=1
endif endif
" Enable file type detection. " Only do this part when Vim was compiled with the +eval feature.
" Use the default filetype settings, so that mail gets 'tw' set to 72, if 1
" 'cindent' is on in C files, etc.
" Also load indent files, to automatically do language-dependent indenting.
" Revert with ":filetype off".
filetype plugin indent on
" Put these in an autocmd group, so that you can revert them with: " Enable file type detection.
" ":augroup vimStartup | au! | augroup END" " Use the default filetype settings, so that mail gets 'tw' set to 72,
augroup vimStartup " 'cindent' is on in C files, etc.
au! " Also load indent files, to automatically do language-dependent indenting.
" Revert with ":filetype off".
filetype plugin indent on
" When editing a file, always jump to the last known cursor position. " Put these in an autocmd group, so that you can revert them with:
" Don't do it when the position is invalid, when inside an event handler " ":augroup vimStartup | au! | augroup END"
" (happens when dropping a file on gvim) and for a commit message (it's augroup vimStartup
" likely a different one than last time). au!
autocmd BufReadPost *
\ if line("'\"") >= 1 && line("'\"") <= line("$") && &ft !~# 'commit'
\ | exe "normal! g`\""
\ | endif
augroup END " When editing a file, always jump to the last known cursor position.
" Don't do it when the position is invalid, when inside an event handler
" (happens when dropping a file on gvim) and for a commit message (it's
" likely a different one than last time).
autocmd BufReadPost *
\ if line("'\"") >= 1 && line("'\"") <= line("$") && &ft !~# 'commit'
\ | exe "normal! g`\""
\ | endif
augroup END
endif
" Convenient command to see the difference between the current buffer and the " Convenient command to see the difference between the current buffer and the
" file it was loaded from, thus the changes you made. " file it was loaded from, thus the changes you made.

2
src/version.c
View File

@ -779,6 +779,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
948,
/**/ /**/
947, 947,
/**/ /**/