Merge remote-tracking branch 'vim/master'

Author: splhack

runtime/defaults.vim

@@ -1,7 +1,7 @@
 " The default vimrc file.
 "
 " Maintainer:	Bram Moolenaar <[email protected]>
-" Last change:	2017 Apr 01
+" Last change:	2017 Apr 12
 "
 " This is loaded if no vimrc file was found.
 " Except when Vim is run with "-u NONE" or "-C".
@@ -28,13 +28,9 @@ endif
 
 " When the +eval feature is missing, the set command above will be skipped.
 " Use a trick to reset compatible only when the +eval feature is missing.
-if 1
-  nnoremap : :"
-endif
-silent normal :set nocompatible
-if 1
-  nunmap :
-endif
+silent! while 0
+  set nocompatible
+silent! endwhile
 
 " Allow backspacing over everything in insert mode.
 set backspace=indent,eol,start

runtime/filetype.vim

@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <[email protected]>
-" Last Change:	2017 Mar 27
+" Last Change:	2017 Apr 15
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -310,9 +310,10 @@ au BufNewFile,BufRead *.bl			setf blank
 au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old   setf xml
 
 " Bazel (http://bazel.io)
-autocmd BufRead,BufNewFile *.bzl,WORKSPACE setfiletype bzl
+autocmd BufRead,BufNewFile *.bzl,WORKSPACE 	setf bzl
 if has("fname_case")
-  autocmd BufRead,BufNewFile BUILD setfiletype bzl
+  " There is another check for BUILD further below.
+  autocmd BufRead,BufNewFile BUILD		setf bzl
 endif
 
 " C or lpc
@@ -2602,6 +2603,11 @@ au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm')
 " Bazaar version control
 au BufNewFile,BufRead bzr_log.*			setf bzr
 
+" Bazel build file
+if !has("fname_case")
+  au BufNewFile,BufRead BUILD			setf bzl
+endif
+
 " BIND zone
 au BufNewFile,BufRead */named/db.*,*/bind/db.*	call s:StarSetf('bindzone')
 

src/quickfix.c

@@ -2750,6 +2750,7 @@ qf_free(qf_info_T *qi, int idx)
     vim_free(qi->qf_lists[idx].qf_title);
     qi->qf_lists[idx].qf_title = NULL;
     qi->qf_lists[idx].qf_index = 0;
+    qi->qf_lists[idx].qf_last = NULL;
 
     qf_clean_dir_stack(&qi->qf_dir_stack);
     qi->qf_directory = NULL;

src/version.c

@@ -779,6 +779,12 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    566,
+/**/
+    565,
+/**/
+    564,
 /**/
     563,
 /**/