|
 |
2b18509 |
To: vim-dev@vim.org
|
|
|
2b18509 |
Subject: Patch 7.2.310
|
|
|
2b18509 |
Fcc: outbox
|
|
|
2b18509 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
2b18509 |
Mime-Version: 1.0
|
|
|
2b18509 |
Content-Type: text/plain; charset=UTF-8
|
|
|
2b18509 |
Content-Transfer-Encoding: 8bit
|
|
|
2b18509 |
------------
|
|
|
2b18509 |
|
|
|
2b18509 |
Patch 7.2.310
|
|
|
2b18509 |
Problem: When a filetype plugin in ~/.vim/ftdetect uses ":setfiletype" and
|
|
|
2b18509 |
the file starts with a "# comment" it gets "conf" filetype.
|
|
|
2b18509 |
Solution: Check for "conf" filetype after using ftdetect plugins.
|
|
|
2b18509 |
Files: runtime/filetype.vim
|
|
|
2b18509 |
|
|
|
2b18509 |
|
|
|
2b18509 |
*** ../vim-7.2.309/runtime/filetype.vim 2008-08-06 18:56:36.000000000 +0200
|
|
|
2b18509 |
--- runtime/filetype.vim 2009-12-02 12:08:42.000000000 +0100
|
|
|
2b18509 |
***************
|
|
|
2b18509 |
*** 2400,2405 ****
|
|
|
2b18509 |
--- 2435,2446 ----
|
|
|
2b18509 |
au BufNewFile,BufRead zsh*,zlog* call s:StarSetf('zsh')
|
|
|
2b18509 |
|
|
|
2b18509 |
|
|
|
2b18509 |
+
|
|
|
2b18509 |
+ " Use the filetype detect plugins. They may overrule any of the previously
|
|
|
2b18509 |
+ " detected filetypes.
|
|
|
2b18509 |
+ runtime! ftdetect/*.vim
|
|
|
2b18509 |
+
|
|
|
2b18509 |
+
|
|
|
2b18509 |
" Generic configuration file (check this last, it's just guessing!)
|
|
|
2b18509 |
au BufNewFile,BufRead,StdinReadPost *
|
|
|
2b18509 |
\ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat
|
|
|
2b18509 |
***************
|
|
|
2b18509 |
*** 2408,2417 ****
|
|
|
2b18509 |
\ setf conf |
|
|
|
2b18509 |
\ endif
|
|
|
2b18509 |
|
|
|
2b18509 |
- " Use the plugin-filetype checks last, they may overrule any of the previously
|
|
|
2b18509 |
- " detected filetypes.
|
|
|
2b18509 |
- runtime! ftdetect/*.vim
|
|
|
2b18509 |
-
|
|
|
2b18509 |
augroup END
|
|
|
2b18509 |
|
|
|
2b18509 |
|
|
|
2b18509 |
--- 2449,2454 ----
|
|
|
2b18509 |
*** ../vim-7.2.309/src/version.c 2009-11-26 20:41:19.000000000 +0100
|
|
|
2b18509 |
--- src/version.c 2009-12-02 12:05:27.000000000 +0100
|
|
|
2b18509 |
***************
|
|
|
2b18509 |
*** 683,684 ****
|
|
|
2b18509 |
--- 683,686 ----
|
|
|
2b18509 |
{ /* Add new patch number below this line */
|
|
|
2b18509 |
+ /**/
|
|
|
2b18509 |
+ 310,
|
|
|
2b18509 |
/**/
|
|
|
2b18509 |
|
|
|
2b18509 |
--
|
|
|
2b18509 |
A)bort, R)etry, P)lease don't bother me again
|
|
|
2b18509 |
|
|
|
2b18509 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
2b18509 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
2b18509 |
\\\ download, build and distribute -- http://www.A-A-P.org ///
|
|
|
2b18509 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|