summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-02-18 21:32:28 +0100
committerBram Moolenaar <Bram@vim.org>2019-02-18 21:32:28 +0100
commitd53931ae7306acce2cfe8c44db0a15d79adf9e00 (patch)
tree8c474416df2663fe8d91ad140dd8d32717fa34f2
parent7dca2ebbcf508ef2533f1b9f998f7e63c9bbd598 (diff)
downloadvim-git-d53931ae7306acce2cfe8c44db0a15d79adf9e00.tar.gz
patch 8.1.0948: when built without +eval "Vim --clean" produces errorsv8.1.0948
Problem: When built without +eval "Vim --clean" produces errors. (James McCoy) Solution: Do not enable filetype detection.
-rw-r--r--runtime/defaults.vim51
-rw-r--r--src/version.c2
2 files changed, 30 insertions, 23 deletions
diff --git a/runtime/defaults.vim b/runtime/defaults.vim
index b848217cd..e8a0ff40f 100644
--- a/runtime/defaults.vim
+++ b/runtime/defaults.vim
@@ -1,7 +1,7 @@
" The default vimrc file.
"
" 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.
" 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
endif
-" Enable file type detection.
-" Use the default filetype settings, so that mail gets 'tw' set to 72,
-" '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:
-" ":augroup vimStartup | au! | augroup END"
-augroup vimStartup
- au!
-
- " 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
+" Only do this part when Vim was compiled with the +eval feature.
+if 1
+
+ " Enable file type detection.
+ " Use the default filetype settings, so that mail gets 'tw' set to 72,
+ " '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:
+ " ":augroup vimStartup | au! | augroup END"
+ augroup vimStartup
+ au!
+
+ " 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
" file it was loaded from, thus the changes you made.
diff --git a/src/version.c b/src/version.c
index 269c01b0b..4e241adf1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 948,
+/**/
947,
/**/
946,