Skip to content

Commit

Permalink
Updated plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
amix committed May 26, 2013
1 parent 630b462 commit 267c59c
Show file tree
Hide file tree
Showing 15 changed files with 242 additions and 335 deletions.
6 changes: 3 additions & 3 deletions sources_non_forked/nerdtree/README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ The following features and functionality are provided by the NERD tree:
as you left it
* You can have a separate NERD tree for each tab, share trees across tabs,
or a mix of both.
* By default the script overrides the default file browser (netw), so if
you :edit a directory a (slighly modified) NERD tree will appear in the
* By default the script overrides the default file browser (netrw), so if
you :edit a directory a (slightly modified) NERD tree will appear in the
current window
* A programmable menu system is provided (simulates right clicking on a node)
* one default menu plugin is provided to perform basic filesytem
* one default menu plugin is provided to perform basic filesystem
operations (create/delete/move/copy files/directories)
* There's an API for adding your own keymappings

Expand Down
10 changes: 5 additions & 5 deletions sources_non_forked/nerdtree/doc/NERD_tree.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@ The following features and functionality are provided by the NERD tree:
as you left it
* You can have a separate NERD tree for each tab, share trees across tabs,
or a mix of both.
* By default the script overrides the default file browser (netw), so if
you :edit a directory a (slighly modified) NERD tree will appear in the
* By default the script overrides the default file browser (netrw), so if
you :edit a directory a (slightly modified) NERD tree will appear in the
current window
* A programmable menu system is provided (simulates right clicking on a
node)
* one default menu plugin is provided to perform basic filesytem
* one default menu plugin is provided to perform basic filesystem
operations (create/delete/move/copy files/directories)
* There's an API for adding your own keymappings

Expand Down Expand Up @@ -228,7 +228,7 @@ gs......Same as s, but leave the cursor on the NERDTree..........|NERDTree-gs|
O.......Recursively open the selected directory..................|NERDTree-O|
x.......Close the current nodes parent...........................|NERDTree-x|
X.......Recursively close all children of the current node.......|NERDTree-X|
e.......Edit the current dif.....................................|NERDTree-e|
e.......Edit the current dir.....................................|NERDTree-e|

<CR>...............same as |NERDTree-o|.
double-click.......same as the |NERDTree-o| map.
Expand Down Expand Up @@ -780,7 +780,7 @@ If set to 1, doing a >
<
will open up a "secondary" NERD tree instead of a netrw in the target window.

Secondary NERD trees behaves slighly different from a regular trees in the
Secondary NERD trees behaves slightly different from a regular trees in the
following respects:
1. 'o' will open the selected file in the same window as the tree,
replacing it.
Expand Down
2 changes: 1 addition & 1 deletion sources_non_forked/nerdtree/lib/nerdtree/bookmark.vim
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function! s:Bookmark.BookmarkNames()
endfunction

" FUNCTION: Bookmark.CacheBookmarks(silent) {{{1
" Class method to read all bookmarks from the bookmarks file intialize
" Class method to read all bookmarks from the bookmarks file initialize
" bookmark objects for each one.
"
" Args:
Expand Down
13 changes: 8 additions & 5 deletions sources_non_forked/vim-bundle-mako/syntax/mako.vim
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
" Language: Mako
" Maintainer: Armin Ronacher <[email protected]>
" URL: http://lucumr.pocoo.org/
" Last Change: 2008 September 12
" Version: 0.6.1
" Last Change: 2013-05-01
" Version: 0.6.1+
"
" Thanks to Brine Rue <[email protected]> who noticed a bug in the
" delimiter handling.
Expand All @@ -27,6 +27,9 @@ endif
ru! syntax/html.vim
unlet b:current_syntax

" tell html.vim what syntax groups should take precedence (see :help html.vim)
syn cluster htmlPreproc add=makoLine,makoVariable,makoTag,makoDocComment,makoDefEnd,makoText,makoDelim,makoEnd,makoComment,makoEscape

"Put the python syntax file in @pythonTop
syn include @pythonTop syntax/python.vim

Expand Down Expand Up @@ -54,8 +57,8 @@ syn region makoAttributeValue containedin=makoTag contained start=/"/ skip=/\\"/
syn region makoAttributeValue containedin=MakoTag contained start=/'/ skip=/\\'/ end=/'/

" Tags
syn region makoTag matchgroup=makoDelim start="<%\(def\|call\|page\|include\|namespace\|inherit\|block\)\>" end="/\?>"
syn match makoDelim "</%\(def\|call\|namespace\|block\)>"
syn region makoTag matchgroup=makoDelim start="<%\(def\|call\|page\|include\|namespace\|inherit\|block\|[a-zA-Z_][a-zA-Z0-9_]*:[a-zA-Z_][a-zA-Z0-9_]*\)\>" end="/\?>"
syn match makoDelim "</%\(def\|call\|namespace\|block\|[a-zA-Z_][a-zA-Z0-9_]*:[a-zA-Z_][a-zA-Z0-9_]*\)>"

" Newline Escapes
syn match makoEscape /\\$/
Expand Down Expand Up @@ -83,4 +86,4 @@ if version >= 508 || !exists("did_mako_syn_inits")
delc HiLink
endif

let b:current_syntax = "eruby"
let b:current_syntax = "html"
3 changes: 3 additions & 0 deletions sources_non_forked/vim-markdown/syntax/markdown.vim
Original file line number Diff line number Diff line change
Expand Up @@ -126,5 +126,8 @@ hi def link markdownEscape Special
hi def link markdownError Error

let b:current_syntax = "markdown"
if main_syntax ==# 'markdown'
unlet main_syntax
endif

" vim:set sw=2:
37 changes: 37 additions & 0 deletions sources_non_forked/vim-snipmate/Contributors.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Contributors #

SnipMate was originally authored by Michael Sanders
([Vim](http://www.vim.org/account/profile.php?user_id=16544),
[GitHub](https://github.com/msanders)).

It is currently maintained by [Rok Garbas]([email protected]), [Marc
Weber]([email protected]), and [Adnan Zafar](https://github.com/ajzafar) with
additional contributions from:

* [alderz](https://github.com/alderz)
* [asymmetric](https://github.com/asymmetric)
* [darkwise](https://github.com/darkwise)
* [henrik](https://github.com/henrik)
* [holizz](https://github.com/holizz)
* [honza](https://github.com/honza)
* [hpesoj](https://github.com/hpesoj)
* [ironcamel](https://github.com/ironcamel)
* [jb55](https://github.com/jb55)
* [jbernard](https://github.com/jbernard)
* [jherdman](https://github.com/jherdman)
* [kozo2](https://github.com/kozo2)
* [lilydjwg](https://github.com/lilydjwg)
* [marutanm](https://github.com/marutanm)
* [MicahElliott](https://github.com/MicahElliott)
* [muffinresearch](https://github.com/muffinresearch)
* [pielgrzym](https://github.com/pielgrzym)
* [pose](https://github.com/pose)
* [r00k](https://github.com/r00k)
* [radicalbit](https://github.com/radicalbit)
* [redpill](https://github.com/redpill)
* [robhudson](https://github.com/robhudson)
* [sickill](https://github.com/sickill)
* [statik](https://github.com/statik)
* [steveno](https://github.com/steveno)
* [taq](https://github.com/taq)
* [thisgeek](https://github.com/thisgeek)
53 changes: 53 additions & 0 deletions sources_non_forked/vim-snipmate/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# SnipMate #

SnipMate aims to provide support for textual snippets, similar to TextMate or
other Vim plugins like [UltiSnips][ultisnips]. For
example, in C, typing `for<tab>` could be expanded to

for (i = 0; i < count; i++) {
/* code */
}

with successive presses of tab jumping around the snippet.

Originally authored by [Michael Sanders][msanders], SnipMate was forked in 2011
after a stagnation in development. This fork is currently maintained by [Rok
Garbas][garbas], [Marc Weber][marcweber], and [Adnan Zafar][ajzafar].


## Installing SnipMate ##

SnipMate depends on [vim-addon-mw-utils][mw-utils] and [tlib][tlib]. We
recommend one of the following ways of installing all three.

* Using [Pathogen][pathogen], run the following commands:

% cd ~/.vim/bundle
% git clone https://github.com/tomtom/tlib_vim.git
% git clone https://github.com/MarcWeber/vim-addon-mw-utils.git
% git clone https://github.com/garbas/vim-snipmate.git

* Using [VAM][vam], add `vim-snippets` to the list of packages to be installed.

* Using [Vundle][vundle], add the following to your `vimrc` then run
`:BundleInstall`

Bundle "MarcWeber/vim-addon-mw-utils"
Bundle "tomtom/tlib_vim"
Bundle "garbas/vim-snipmate"

Lastly, since SnipMate does not ship with any snippets, we suggest looking at
the [vim-snippets][vim-snippets] repository.


[ultisnips]: https://github.com/sirver/ultisnips
[msanders]: https://github.com/msanders
[garbas]: https://github.com/garbas
[marcweber]: https://github.com/marcweber
[ajzafar]: https://github.com/ajzafar
[mw-utils]: https://github.com/marcweber/vim-addon-mw-utils
[tlib]: https://github.com/tomtom/tlib_vim
[vim-snippets]: https://github.com/honza/vim-snippets
[vam]: https://github.com/marcweber/vim-addon-manager
[pathogen]: https://github.com/tpope/vim-pathogen
[vundle]: https://github.com/gmarik/vundle
Loading

0 comments on commit 267c59c

Please sign in to comment.