diff options
author | Florian Pritz <bluewind@xssn.at> | 2010-05-17 12:04:10 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@xssn.at> | 2010-05-17 12:04:10 +0200 |
commit | 545b0b7de32c86264d4ec1eb7b7610e4c1c85946 (patch) | |
tree | 9ad399ce5176aee3c98f216f54a12a3e6d5290c6 /vim/vim-7.2/7.2.310 | |
parent | 8dc1d552c0bab7b72371c3a1529e365410c7548c (diff) | |
parent | ac57415603ea60e9af632e70827dffa22cfff584 (diff) | |
download | aur-packages-545b0b7de32c86264d4ec1eb7b7610e4c1c85946.tar.gz aur-packages-545b0b7de32c86264d4ec1eb7b7610e4c1c85946.tar.xz |
Merge branch 'master' of git://git.server-speed.net/~flo/git/aur
Diffstat (limited to 'vim/vim-7.2/7.2.310')
-rw-r--r-- | vim/vim-7.2/7.2.310 | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/vim/vim-7.2/7.2.310 b/vim/vim-7.2/7.2.310 new file mode 100644 index 0000000..52734dd --- /dev/null +++ b/vim/vim-7.2/7.2.310 @@ -0,0 +1,63 @@ +To: vim-dev@vim.org +Subject: Patch 7.2.310 +Fcc: outbox +From: Bram Moolenaar <Bram@moolenaar.net> +Mime-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.2.310 +Problem: When a filetype plugin in ~/.vim/ftdetect uses ":setfiletype" and + the file starts with a "# comment" it gets "conf" filetype. +Solution: Check for "conf" filetype after using ftdetect plugins. +Files: runtime/filetype.vim + + +*** ../vim-7.2.309/runtime/filetype.vim 2008-08-06 18:56:36.000000000 +0200 +--- runtime/filetype.vim 2009-12-02 12:08:42.000000000 +0100 +*************** +*** 2400,2405 **** +--- 2435,2446 ---- + au BufNewFile,BufRead zsh*,zlog* call s:StarSetf('zsh') + + ++ ++ " Use the filetype detect plugins. They may overrule any of the previously ++ " detected filetypes. ++ runtime! ftdetect/*.vim ++ ++ + " Generic configuration file (check this last, it's just guessing!) + au BufNewFile,BufRead,StdinReadPost * + \ if !did_filetype() && expand("<amatch>") !~ g:ft_ignore_pat +*************** +*** 2408,2417 **** + \ setf conf | + \ endif + +- " Use the plugin-filetype checks last, they may overrule any of the previously +- " detected filetypes. +- runtime! ftdetect/*.vim +- + augroup END + + +--- 2449,2454 ---- +*** ../vim-7.2.309/src/version.c 2009-11-26 20:41:19.000000000 +0100 +--- src/version.c 2009-12-02 12:05:27.000000000 +0100 +*************** +*** 683,684 **** +--- 683,686 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 310, + /**/ + +-- +A)bort, R)etry, P)lease don't bother me again + + /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ +/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ +\\\ download, build and distribute -- http://www.A-A-P.org /// + \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |