1 To: [email protected] |
|
2 Subject: Patch 7.2.310 |
|
3 Fcc: outbox |
|
4 From: Bram Moolenaar <[email protected]> |
|
5 Mime-Version: 1.0 |
|
6 Content-Type: text/plain; charset=UTF-8 |
|
7 Content-Transfer-Encoding: 8bit |
|
8 ------------ |
|
9 |
|
10 Patch 7.2.310 |
|
11 Problem: When a filetype plugin in ~/.vim/ftdetect uses ":setfiletype" and |
|
12 the file starts with a "# comment" it gets "conf" filetype. |
|
13 Solution: Check for "conf" filetype after using ftdetect plugins. |
|
14 Files: runtime/filetype.vim |
|
15 |
|
16 |
|
17 *** ../vim-7.2.309/runtime/filetype.vim 2008-08-06 18:56:36.000000000 +0200 |
|
18 --- runtime/filetype.vim 2009-12-02 12:08:42.000000000 +0100 |
|
19 *************** |
|
20 *** 2400,2405 **** |
|
21 --- 2435,2446 ---- |
|
22 au BufNewFile,BufRead zsh*,zlog* call s:StarSetf('zsh') |
|
23 |
|
24 |
|
25 + |
|
26 + " Use the filetype detect plugins. They may overrule any of the previously |
|
27 + " detected filetypes. |
|
28 + runtime! ftdetect/*.vim |
|
29 + |
|
30 + |
|
31 " Generic configuration file (check this last, it's just guessing!) |
|
32 au BufNewFile,BufRead,StdinReadPost * |
|
33 \ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat |
|
34 *************** |
|
35 *** 2408,2417 **** |
|
36 \ setf conf | |
|
37 \ endif |
|
38 |
|
39 - " Use the plugin-filetype checks last, they may overrule any of the previously |
|
40 - " detected filetypes. |
|
41 - runtime! ftdetect/*.vim |
|
42 - |
|
43 augroup END |
|
44 |
|
45 |
|
46 --- 2449,2454 ---- |
|
47 *** ../vim-7.2.309/src/version.c 2009-11-26 20:41:19.000000000 +0100 |
|
48 --- src/version.c 2009-12-02 12:05:27.000000000 +0100 |
|
49 *************** |
|
50 *** 683,684 **** |
|
51 --- 683,686 ---- |
|
52 { /* Add new patch number below this line */ |
|
53 + /**/ |
|
54 + 310, |
|
55 /**/ |
|
56 |
|
57 -- |
|
58 A)bort, R)etry, P)lease don't bother me again |
|
59 |
|
60 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ |
|
61 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
|
62 \\\ download, build and distribute -- http://www.A-A-P.org /// |
|
63 \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |
|