From e9190b5639ef57f013385b6a28ceee164bd25605 Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Mon, 2 Jun 2014 04:34:08 -0400 Subject: [PATCH] Forked vim-polyglot, replaced a few plugins with some better ones and pulled in all the syntax plugins from darkcloud-vimconfig that vim-polyglot didn't cover, which have been removed as submodules from darkcloud-vimconfig. --- .gitmodules | 24 +++--------------------- README.md | 8 +------- vim/bundle/aftersyntaxc.vim | 1 - vim/bundle/aspnet.vim--Abshire | 1 - vim/bundle/rust.vim | 1 - vim/bundle/systemd-vim-syntax | 1 - vim/bundle/vim-jquery | 1 - vim/bundle/vim-markdown | 1 - vim/bundle/vim-polyglot | 1 - vim/bundle/vim-polyglot-darkcloud | 1 + 10 files changed, 5 insertions(+), 35 deletions(-) delete mode 160000 vim/bundle/aftersyntaxc.vim delete mode 160000 vim/bundle/aspnet.vim--Abshire delete mode 160000 vim/bundle/rust.vim delete mode 160000 vim/bundle/systemd-vim-syntax delete mode 160000 vim/bundle/vim-jquery delete mode 160000 vim/bundle/vim-markdown delete mode 160000 vim/bundle/vim-polyglot create mode 160000 vim/bundle/vim-polyglot-darkcloud diff --git a/.gitmodules b/.gitmodules index a40e5d9..b60d509 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,15 +7,9 @@ [submodule "vim/bundle/vim-pathogen"] path = vim/bundle/vim-pathogen url = https://github.com/tpope/vim-pathogen.git -[submodule "vim/bundle/aspnet.vim--Abshire"] - path = vim/bundle/aspnet.vim--Abshire - url = https://github.com/vim-scripts/aspnet.vim--Abshire.git [submodule "vim/bundle/lightline.vim"] path = vim/bundle/lightline.vim url = https://github.com/itchyny/lightline.vim -[submodule "vim/bundle/vim-jquery"] - path = vim/bundle/vim-jquery - url = https://github.com/phongnh/vim-jquery.git [submodule "vim/bundle/vim-surround"] path = vim/bundle/vim-surround url = https://github.com/tpope/vim-surround.git @@ -28,9 +22,6 @@ [submodule "vim/bundle/emmet-vim"] path = vim/bundle/emmet-vim url = https://github.com/mattn/emmet-vim.git -[submodule "vim/bundle/vim-markdown"] - path = vim/bundle/vim-markdown - url = https://github.com/plasticboy/vim-markdown.git [submodule "vim/bundle/vim-togglelist"] path = vim/bundle/vim-togglelist url = https://github.com/milkypostman/vim-togglelist.git @@ -58,9 +49,6 @@ [submodule "vim/bundle/webapi-vim"] path = vim/bundle/webapi-vim url = https://github.com/mattn/webapi-vim.git -[submodule "vim/bundle/vim-polyglot"] - path = vim/bundle/vim-polyglot - url = https://github.com/sheerun/vim-polyglot.git [submodule "vim/bundle/vim-fugitive"] path = vim/bundle/vim-fugitive url = https://github.com/tpope/vim-fugitive.git @@ -88,21 +76,15 @@ [submodule "vim/bundle/vim-extradite"] path = vim/bundle/vim-extradite url = https://github.com/int3/vim-extradite.git -[submodule "vim/bundle/systemd-vim-syntax"] - path = vim/bundle/systemd-vim-syntax - url = https://github.com/kurayama/systemd-vim-syntax.git -[submodule "vim/bundle/aftersyntaxc.vim"] - path = vim/bundle/aftersyntaxc.vim - url = https://github.com/vim-scripts/aftersyntaxc.vim [submodule "vim/bundle/autoswap.vim"] path = vim/bundle/autoswap.vim url = https://github.com/vim-scripts/autoswap.vim.git -[submodule "vim/bundle/rust.vim"] - path = vim/bundle/rust.vim - url = https://github.com/wting/rust.vim.git [submodule "vim/bundle/goyo.vim"] path = vim/bundle/goyo.vim url = https://github.com/junegunn/goyo.vim.git [submodule "vim/bundle/vim-autoformat"] path = vim/bundle/vim-autoformat url = https://github.com/Chiel92/vim-autoformat.git +[submodule "vim/bundle/vim-polyglot-darkcloud"] + path = vim/bundle/vim-polyglot-darkcloud + url = https://github.com/prurigro/vim-polyglot.git diff --git a/README.md b/README.md index b17a2f9..0a19361 100644 --- a/README.md +++ b/README.md @@ -82,8 +82,6 @@ ## Plugins ## -* [aftersyntaxc.vim](https://github.com/vim-scripts/aftersyntaxc.vim): C Syntax Extensions for better highlighting. -* [aspnet.vim--Abshire](https://github.com/vim-scripts/aspnet.vim--Abshire.git): Syntax highlighting for ASP.NET (asp, aspx etc). * [auto-autoformat](https://github.com/Chiel92/vim-autoformat): Provides easy code formatting in Vim by integrating existing code formatters. * [autoswap.vim](https://github.com/vim-scripts/autoswap.vim): Switch to open editor window instead of asking what to do with swapfile. * [breeze.vim](https://github.com/gcmt/breeze.vim.git): Provides tag matching and navigation shortcuts for HTML. @@ -95,7 +93,6 @@ * [lightline.vim](https://github.com/itchyny/lightline.vim) A light and configurable statusline/tabline for Vim. * [neocomplcache.vim](https://github.com/Shougo/neocomplcache.vim.git) The '*ultimate*' auto-completion system for Vim. * [ReplaceWithRegister](https://github.com/vim-scripts/ReplaceWithRegister.git) Replace text with the contents of a register (for paste+replace without writing over the buffer). -* [rust.vim](https://github.com/wting/rust.vim) Vim support for Rust file detection and syntax highlighting. * [SpellCheck](https://github.com/vim-scripts/SpellCheck.git) Provides a list of spelling mistakes in the bottom bar that can be clicked to find them in the document. * [SudoEdit.vim](https://github.com/vim-scripts/SudoEdit.vim.git) Read and write files without the necessary permissions through the use of sudo. * [syntastic](https://github.com/scrooloose/syntastic.git) Uses system compilers and parsers to check syntax either on-the-fly or after saving a compatible document. @@ -106,16 +103,13 @@ * [unite.vim](https://github.com/Shougo/unite.vim.git) A library used by Vim Filer to help build its user interface. * [vim-fixkey](https://github.com/drmikehenry/vim-fixkey.git) A set of keyboard mappings that override differences in different environments that might normally break consistency or compatibility. * [vim-fugitive](https://github.com/tpope/vim-fugitive.git) A wrapper integrating git into vim in such a way as to provide features neither of them could offer on their own. -* [vim-jquery](https://github.com/phongnh/vim-jquery.git) An extension adding highlighting for jquery to javascript syntax. -* [vim-markdown](https://github.com/plasticboy/vim-markdown.git) Syntax highlighting, matching rules and mappings for the original Markdown and extensions. * [vim-move](https://github.com/matze/vim-move.git) Provides a few convenient ways to move selected text. * [vim-neco-calc](https://github.com/hrsh7th/vim-neco-calc.git) A calculator plugin extending neocomplcache.vim for the on-the-fly auto-completion of simple math equations. * [vim-pathogen](https://github.com/tpope/vim-pathogen.git) A plugin to load other plugins while keeping them isolated in their own directory structure rather than all dumped together. -* [vim-polyglot](https://github.com/sheerun/vim-polyglot.git) A meta-package of what it attempts to ensure are the best syntax plugins for each file type. +* [vim-polyglot](https://github.com/prurigro/vim-polyglot.git) The darkcloud-vimconfig fork of a meta-package that attempts to provide the best syntax plugins for each file type. * [vim-signify](https://github.com/mhinz/vim-signify) When a version controlled file is changed, this displays a column showing where and how, and allows for navigation to and between differences. * [vim-surround](https://github.com/tpope/vim-surround.git) Provides functionality to exchange surrounding delimiters and xml-style tags with another, or simply remove them. * [vim-repeat](https://github.com/tpope/vim-repeat.git) A library used by vim-surround to allow its delimiter-switching functions to be repeated with the `.` command. -* [systemd-vim-syntax](https://github.com/kurayama/systemd-vim-syntax) A syntax plugin providing support for systemd unit files. * [vim-togglelist](https://github.com/milkypostman/vim-togglelist.git) Supplies toggle functions for the *location* and *error* lists, which are used by a number of plugins and normally require separate open and close commands. * [vim-trailing-whitespace](https://github.com/bronson/vim-trailing-whitespace.git) Highlights and allows for the easy removal of trailing whitespace in documents. diff --git a/vim/bundle/aftersyntaxc.vim b/vim/bundle/aftersyntaxc.vim deleted file mode 160000 index 25d2fdb..0000000 --- a/vim/bundle/aftersyntaxc.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 25d2fdbe06e09a7ea6f8704121ef08db1972f050 diff --git a/vim/bundle/aspnet.vim--Abshire b/vim/bundle/aspnet.vim--Abshire deleted file mode 160000 index 7a665fe..0000000 --- a/vim/bundle/aspnet.vim--Abshire +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7a665fe28e5bb6c5f351be2c719ef55b246fe8a0 diff --git a/vim/bundle/rust.vim b/vim/bundle/rust.vim deleted file mode 160000 index 0b32737..0000000 --- a/vim/bundle/rust.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0b32737caacccf7796f422b96385c47410bd2384 diff --git a/vim/bundle/systemd-vim-syntax b/vim/bundle/systemd-vim-syntax deleted file mode 160000 index 91f59d1..0000000 --- a/vim/bundle/systemd-vim-syntax +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 91f59d19d52e431fa1ccf9dde238a99102876174 diff --git a/vim/bundle/vim-jquery b/vim/bundle/vim-jquery deleted file mode 160000 index 192bf2a..0000000 --- a/vim/bundle/vim-jquery +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 192bf2a74621067919f39e130b94a990b2ee7458 diff --git a/vim/bundle/vim-markdown b/vim/bundle/vim-markdown deleted file mode 160000 index 1c2cccb..0000000 --- a/vim/bundle/vim-markdown +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1c2cccbafbbd74407d3d2209e77143a4e8207584 diff --git a/vim/bundle/vim-polyglot b/vim/bundle/vim-polyglot deleted file mode 160000 index e961fa8..0000000 --- a/vim/bundle/vim-polyglot +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e961fa80374369c9e299b333639db0dc43d1f126 diff --git a/vim/bundle/vim-polyglot-darkcloud b/vim/bundle/vim-polyglot-darkcloud new file mode 160000 index 0000000..6d3a4cc --- /dev/null +++ b/vim/bundle/vim-polyglot-darkcloud @@ -0,0 +1 @@ +Subproject commit 6d3a4ccfe9f9761846c8ebefd18be923983a429d