]>
Commit | Line | Data |
---|---|---|
ef75664d AG |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.1.263 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.1.263 | |
11 | Problem: The filetype can consist of two dot separated names. This works | |
12 | for syntax and ftplugin, but not for indent. (Brett Stahlman) | |
13 | Solution: Use split() and loop over each dot separated name. | |
14 | Files: runtime/indent.vim | |
15 | ||
16 | ||
17 | *** ../vim-7.1.262/runtime/indent.vim Mon Mar 28 22:56:55 2005 | |
18 | --- runtime/indent.vim Fri Feb 22 21:05:39 2008 | |
19 | *************** | |
20 | *** 1,7 **** | |
21 | " Vim support file to switch on loading indent files for file types | |
22 | " | |
23 | " Maintainer: Bram Moolenaar <Bram@vim.org> | |
24 | ! " Last Change: 2005 Mar 28 | |
25 | ||
26 | if exists("did_indent_on") | |
27 | finish | |
28 | --- 1,7 ---- | |
29 | " Vim support file to switch on loading indent files for file types | |
30 | " | |
31 | " Maintainer: Bram Moolenaar <Bram@vim.org> | |
32 | ! " Last Change: 2008 Feb 22 | |
33 | ||
34 | if exists("did_indent_on") | |
35 | finish | |
36 | *************** | |
37 | *** 15,25 **** | |
38 | exe b:undo_indent | |
39 | unlet! b:undo_indent b:did_indent | |
40 | endif | |
41 | ! if expand("<amatch>") != "" | |
42 | if exists("b:did_indent") | |
43 | unlet b:did_indent | |
44 | endif | |
45 | ! runtime! indent/<amatch>.vim | |
46 | endif | |
47 | endfunc | |
48 | augroup END | |
49 | --- 15,31 ---- | |
50 | exe b:undo_indent | |
51 | unlet! b:undo_indent b:did_indent | |
52 | endif | |
53 | ! let s = expand("<amatch>") | |
54 | ! if s != "" | |
55 | if exists("b:did_indent") | |
56 | unlet b:did_indent | |
57 | endif | |
58 | ! | |
59 | ! " When there is a dot it is used to separate filetype names. Thus for | |
60 | ! " "aaa.bbb" load "indent/aaa.vim" and then "indent/bbb.vim". | |
61 | ! for name in split(s, '\.') | |
62 | ! exe 'runtime! indent/' . name . '.vim' | |
63 | ! endfor | |
64 | endif | |
65 | endfunc | |
66 | augroup END | |
67 | *** ../vim-7.1.262/src/version.c Wed Feb 20 20:09:44 2008 | |
68 | --- src/version.c Mon Feb 25 20:44:04 2008 | |
69 | *************** | |
70 | *** 668,669 **** | |
71 | --- 668,671 ---- | |
72 | { /* Add new patch number below this line */ | |
73 | + /**/ | |
74 | + 263, | |
75 | /**/ | |
76 | ||
77 | -- | |
78 | hundred-and-one symptoms of being an internet addict: | |
79 | 45. You buy a Captain Kirk chair with a built-in keyboard and mouse. | |
80 | ||
81 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
82 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
83 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
84 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |