Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 3 commits
  • 29 files changed
  • 0 comments
  • 1 contributor
9  .gitmodules
@@ -22,9 +22,6 @@
22 22
 [submodule "vim/bundle/supertab"]
23 23
 	path = vim/bundle/supertab
24 24
 	url = http://github.com/ervandew/supertab.git
25  
-[submodule "vim/bundle/vim-markdown-preview"]
26  
-	path = vim/bundle/vim-markdown-preview
27  
-	url = https://github.com/robgleeson/vim-markdown-preview.git
28 25
 [submodule "vim/bundle/scss-syntax.vim"]
29 26
 	path = vim/bundle/scss-syntax.vim
30 27
 	url = https://github.com/cakebaker/scss-syntax.vim.git
@@ -85,3 +82,9 @@
85 82
 [submodule "vim/bundle/mango"]
86 83
 	path = vim/bundle/mango
87 84
 	url = https://github.com/goatslacker/mango.vim
  85
+[submodule "vim/bundle/tagbar"]
  86
+	path = vim/bundle/tagbar
  87
+	url = https://github.com/majutsushi/tagbar.git
  88
+[submodule "vim/bundle/reload"]
  89
+	path = vim/bundle/reload
  90
+	url = https://github.com/xolox/vim-reload.git
2  bash/bash_profile
@@ -3,4 +3,4 @@ source "$HOME/dotfiles/bash/autojump"
3 3
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
4 4
 export NARWHAL_ENGINE=jsc
5 5
 
6  
-export PATH="/usr/local/narwhal/bin:$PATH"
  6
+export PATH="/Users/hornairs/Code/android-sdk/tools":$PATH
3  bootstrap.sh
... ...
@@ -1,4 +1,4 @@
1  
-rm ../.bash_profile ../.bashrc ../.gitignore ../.gitconfig ../.gvimrc ../.vimrc ../.vim ../.toprc ../.screenrc ../.rdebugrc ../.ackrc
  1
+rm ../.bash_profile ../.bashrc ../.gitignore ../.gitconfig ../.gvimrc ../.vimrc ../.vim ../.toprc ../.screenrc ../.rdebugrc ../.ackrc ../.rdebugrc ../.ctags
2 2
 
3 3
 ln -s ~/dotfiles/bash/bash_profile ../.bash_profile
4 4
 ln -s ~/dotfiles/bash/bashrc ../.bashrc
@@ -11,5 +11,6 @@ ln -s ~/dotfiles/screenrc ../.screenrc
11 11
 ln -s ~/dotfiles/toprc ../.toprc
12 12
 ln -s ~/dotfiles/.ackrc ../.ackrc
13 13
 ln -s ~/dotfiles/rdebugrc ../.rdebugrc
  14
+ln -s ~/dotfiles/ctags ../.ctags
14 15
 
15 16
 git config --global core.excludesfile ~/.gitignore
5  ctags
... ...
@@ -0,0 +1,5 @@
  1
+--langdef=coffee
  2
+--langmap=coffee:.coffee
  3
+--regex-coffee=/^[ \t]*class[ \t]+([A-Za-z\.]+)[ \t]*.*$/\1/c,class/
  4
+--regex-coffee=/^[ \t]*\@?(::)?([A-Za-z\.]+)[ \t]*(:|=).*->.*$/\2/f,function/
  5
+--regex-coffee=/^[ \t]*\@(classA|a)?ccessor[ \t]*("|')([A-Za-z\.]+)("|').*->.*$/\3/a,accessor/
3  git/gitconfig
@@ -59,6 +59,7 @@
59 59
   f = fetch
60 60
   r = reset
61 61
   p = push
  62
+	tree = log -n 50 --pretty=\"%C(yellow)%h %Creset %s %C(red)(%cr)%Creset\" --graph
62 63
 [difftool "Kaleidoscope"]
63 64
 	cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
64 65
 [difftool]
@@ -75,3 +76,5 @@ trustExitCode = true
75 76
 [mergetool "diffmerge"]
76 77
 	cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\""
77 78
 	trustExitCode = true
  79
+[push]
  80
+	default = current
6  git/gitignore
... ...
@@ -1,6 +1,6 @@
1 1
 .DS_Store
2  
-*.swp
3  
-*.swo
  2
+*.sw?
4 3
 *.pyc
5  
-tags
  4
+/tags
6 5
 script/vendor_batman
  6
+.rbenv-version
1  vim/.VimballRecord
... ...
@@ -0,0 +1 @@
  1
+markdown-1.2.2.vba: call delete('/Users/hornairs/.vim/ftdetect/markdown.vim')|call delete('/Users/hornairs/.vim/snippets/markdown.snippets')|call delete('/Users/hornairs/.vim/syntax/markdown.vim')
2  vim/bundle/coffee-script
... ...
@@ -1 +1 @@
1  
-Subproject commit 14e001ce47d8f5ea098e487e33817f95b637491a
  1
+Subproject commit 049c8cc01c32931ff115f15b44dfc3a8d3a35872
2  vim/bundle/ctrlp
... ...
@@ -1 +1 @@
1  
-Subproject commit 5dd5e526c0133a448344632e938c2449d0999a07
  1
+Subproject commit 3453b0d473a71efa792cae9946eb97e32528ac7a
2  vim/bundle/endwise
... ...
@@ -1 +1 @@
1  
-Subproject commit d8c887b93b7ceb250c02ee7d9fc36de09f8b120d
  1
+Subproject commit 74306aa18c03ee2fdb044609e6f0bc866872711d
2  vim/bundle/nerdcommenter
... ...
@@ -1 +1 @@
1  
-Subproject commit 5a9371437f97eef12325c04607de5e58b7168432
  1
+Subproject commit 98cec44ef6e8c93f89fb7911a03d7eaa75fe1249
2  vim/bundle/nerdtree
... ...
@@ -1 +1 @@
1  
-Subproject commit 1cd50482d2b0137a3faa3ee6ec4cb9d425bd3bb6
  1
+Subproject commit 2a0578227ebcc334da64f5e93137926388f71ce6
1  vim/bundle/reload
... ...
@@ -0,0 +1 @@
  1
+Subproject commit b257136deb45a8fb7375dac16150236d194cc25f
1  vim/bundle/tagbar
... ...
@@ -0,0 +1 @@
  1
+Subproject commit ba0123cc91c75b9bed2ee303e9c0e70460765eff
6  vim/bundle/vim-batman/after/syntax/html.vim
... ...
@@ -1,7 +1,7 @@
1  
-syn match batmanBindingArg /\sdata-\(bind\|route\|template\|showif\|hideif\|context\)=/he=e-1 contained containedin=htmlTag nextgroup=batmanBindingVal
  1
+syn match batmanBindingArg /\sdata-\(bind\|route\|template\|showif\|hideif\|context\|renderif\|view\)=/he=e-1 contained containedin=htmlTag nextgroup=batmanBindingVal
2 2
 
3  
-syn match batmanAttributeBindingArg /\sdata-\(bind\|event\|addclass\|removeclass\|formfor\)-[^=]\+/ contained containedin=htmlTag nextgroup=batmanBindingVal
4  
-syn region batmanAttributeBindingIdentifier matchgroup=batmanAttributeBindingArg start=/\sdata-\(template\|foreach\|formfor\)-/ matchgroup=Ignore end=/=/ contained containedin=htmlTag nextgroup=batmanBindingVal
  3
+syn match batmanAttributeBindingArg /\sdata-\(bind\|event\|addclass\|removeclass\|formfor\)-[^=]\+=/           contained containedin=htmlTag nextgroup=batmanBindingVal
  4
+syn region batmanAttributeBindingIdentifier matchgroup=batmanAttributeBindingArg start=/\sdata-\(template\|yield\|contentfor\|foreach\|formfor\)-/ end=/=/ contained containedin=htmlTag nextgroup=batmanBindingVal
5 5
 
6 6
 syn match batmanBindingVal /"[^"]*"/hs=s+1,he=e-1 contained
7 7
 syn match batmanBindingVal /'[^']*'/hs=s+1,he=e-1 contained
6  vim/bundle/vim-markdown/ftdetect/markdown.vim
... ...
@@ -1,6 +0,0 @@
1  
-autocmd BufNewFile,BufRead *.markdown,*.md,*.mdown,*.mkd,*.mkdn
2  
-      \ if &ft =~# '^\%(conf\|modula2\)$' |
3  
-      \   set ft=markdown |
4  
-      \ else |
5  
-      \   setf markdown |
6  
-      \ endif
18  vim/bundle/vim-markdown/ftplugin/markdown.vim
... ...
@@ -1,18 +0,0 @@
1  
-" Vim filetype plugin
2  
-" Language:		Markdown
3  
-" Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
4  
-
5  
-if exists("b:did_ftplugin")
6  
-  finish
7  
-endif
8  
-
9  
-runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
10  
-unlet! b:did_ftplugin
11  
-
12  
-setlocal comments=fb:*,fb:-,fb:+,n:> commentstring=>\ %s
13  
-setlocal formatoptions+=tcqln
14  
-setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^[-*+]\\s\\+
15  
-
16  
-let b:undo_ftplugin .= "|setl cms< com< fo<"
17  
-
18  
-" vim:set sw=2:
101  vim/bundle/vim-markdown/syntax/markdown.vim
... ...
@@ -1,101 +0,0 @@
1  
-" Vim syntax file
2  
-" Language:     Markdown
3  
-" Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
4  
-" Filenames:    *.markdown
5  
-
6  
-if exists("b:current_syntax")
7  
-  finish
8  
-endif
9  
-
10  
-runtime! syntax/html.vim
11  
-unlet! b:current_syntax
12  
-
13  
-syn sync minlines=10
14  
-syn case ignore
15  
-
16  
-syn match markdownValid '[<>]\S\@!'
17  
-syn match markdownValid '&\%(#\=\w*;\)\@!'
18  
-
19  
-syn match markdownLineStart "^[<@]\@!" nextgroup=@markdownBlock
20  
-
21  
-syn cluster markdownBlock contains=markdownH1,markdownH2,markdownH3,markdownH4,markdownH5,markdownH6,markdownBlockquote,markdownListMarker,markdownOrderedListMarker,markdownCodeBlock,markdownRule
22  
-syn cluster markdownInline contains=markdownLineBreak,markdownLinkText,markdownItalic,markdownBold,markdownCode,markdownEscape,@htmlTop
23  
-
24  
-syn match markdownH1 ".\+\n=\+$" contained contains=@markdownInline,markdownHeadingRule
25  
-syn match markdownH2 ".\+\n-\+$" contained contains=@markdownInline,markdownHeadingRule
26  
-
27  
-syn match markdownHeadingRule "^[=-]\+$" contained
28  
-
29  
-syn region markdownH1 matchgroup=markdownHeadingDelimiter start="##\@!"      end="#*\s*$" keepend oneline contains=@markdownInline contained
30  
-syn region markdownH2 matchgroup=markdownHeadingDelimiter start="###\@!"     end="#*\s*$" keepend oneline contains=@markdownInline contained
31  
-syn region markdownH3 matchgroup=markdownHeadingDelimiter start="####\@!"    end="#*\s*$" keepend oneline contains=@markdownInline contained
32  
-syn region markdownH4 matchgroup=markdownHeadingDelimiter start="#####\@!"   end="#*\s*$" keepend oneline contains=@markdownInline contained
33  
-syn region markdownH5 matchgroup=markdownHeadingDelimiter start="######\@!"  end="#*\s*$" keepend oneline contains=@markdownInline contained
34  
-syn region markdownH6 matchgroup=markdownHeadingDelimiter start="#######\@!" end="#*\s*$" keepend oneline contains=@markdownInline contained
35  
-
36  
-syn match markdownBlockquote ">\s" contained nextgroup=@markdownBlock
37  
-
38  
-syn region markdownCodeBlock start="    \|\t" end="$" contained
39  
-
40  
-" TODO: real nesting
41  
-syn match markdownListMarker " \{0,4\}[-*+]\%(\s\+\S\)\@=" contained
42  
-syn match markdownOrderedListMarker " \{0,4}\<\d\+\.\%(\s*\S\)\@=" contained
43  
-
44  
-syn match markdownRule "\* *\* *\*[ *]*$" contained
45  
-syn match markdownRule "- *- *-[ -]*$" contained
46  
-
47  
-syn match markdownLineBreak "\s\{2,\}$"
48  
-
49  
-syn region markdownIdDeclaration matchgroup=markdownLinkDelimiter start="^ \{0,3\}!\=\[" end="\]:" oneline keepend nextgroup=markdownUrl skipwhite
50  
-syn match markdownUrl "\S\+" nextgroup=markdownUrlTitle skipwhite contained
51  
-syn region markdownUrl matchgroup=markdownUrlDelimiter start="<" end=">" oneline keepend nextgroup=markdownUrlTitle skipwhite contained
52  
-syn region markdownUrlTitle matchgroup=markdownUrlTitleDelimiter start=+"+ end=+"+ keepend contained
53  
-syn region markdownUrlTitle matchgroup=markdownUrlTitleDelimiter start=+'+ end=+'+ keepend contained
54  
-syn region markdownUrlTitle matchgroup=markdownUrlTitleDelimiter start=+(+ end=+)+ keepend contained
55  
-
56  
-syn region markdownLinkText matchgroup=markdownLinkTextDelimiter start="!\=\[\%(\_[^]]*]\%( \=[[(]\)\)\@=" end="\]\%( \=[[(]\)\@=" keepend nextgroup=markdownLink,markdownId skipwhite contains=@markdownInline,markdownLineStart
57  
-syn region markdownLink matchgroup=markdownLinkDelimiter start="(" end=")" contains=markdownUrl keepend contained
58  
-syn region markdownId matchgroup=markdownIdDelimiter start="\[" end="\]" keepend contained
59  
-syn region markdownAutomaticLink matchgroup=markdownUrlDelimiter start="<\%(\w\+:\|[[:alnum:]_+-]\+@\)\@=" end=">" keepend oneline
60  
-
61  
-syn region markdownItalic start="\S\@<=\*\|\*\S\@=" end="\S\@<=\*\|\*\S\@=" keepend contains=markdownLineStart
62  
-syn region markdownItalic start="\S\@<=_\|_\S\@=" end="\S\@<=_\|_\S\@=" keepend contains=markdownLineStart
63  
-syn region markdownBold start="\S\@<=\*\*\|\*\*\S\@=" end="\S\@<=\*\*\|\*\*\S\@=" keepend contains=markdownLineStart
64  
-syn region markdownBold start="\S\@<=__\|__\S\@=" end="\S\@<=__\|__\S\@=" keepend contains=markdownLineStart
65  
-syn region markdownCode matchgroup=markdownCodeDelimiter start="`" end="`" transparent keepend contains=markdownLineStart
66  
-syn region markdownCode matchgroup=markdownCodeDelimiter start="`` \=" end=" \=``" keepend contains=markdownLineStart
67  
-
68  
-syn match markdownEscape "\\[][\\`*_{}()#+.!-]"
69  
-
70  
-hi def link markdownH1                    htmlH1
71  
-hi def link markdownH2                    htmlH2
72  
-hi def link markdownH3                    htmlH3
73  
-hi def link markdownH4                    htmlH4
74  
-hi def link markdownH5                    htmlH5
75  
-hi def link markdownH6                    htmlH6
76  
-hi def link markdownHeadingRule           markdownRule
77  
-hi def link markdownHeadingDelimiter      Delimiter
78  
-hi def link markdownOrderedListMarker     markdownListMarker
79  
-hi def link markdownListMarker            htmlTagName
80  
-hi def link markdownBlockquote            Comment
81  
-hi def link markdownRule                  PreProc
82  
-
83  
-hi def link markdownLinkText              htmlLink
84  
-hi def link markdownIdDeclaration         Typedef
85  
-hi def link markdownId                    Type
86  
-hi def link markdownAutomaticLink         markdownUrl
87  
-hi def link markdownUrl                   Float
88  
-hi def link markdownUrlTitle              String
89  
-hi def link markdownIdDelimiter           markdownLinkDelimiter
90  
-hi def link markdownUrlDelimiter          htmlTag
91  
-hi def link markdownUrlTitleDelimiter     Delimiter
92  
-
93  
-hi def link markdownItalic                htmlItalic
94  
-hi def link markdownBold                  htmlBold
95  
-hi def link markdownCodeDelimiter         Delimiter
96  
-
97  
-hi def link markdownEscape                Special
98  
-
99  
-let b:current_syntax = "markdown"
100  
-
101  
-" vim:set sw=2:
1  vim/bundle/vim-reload
... ...
@@ -1 +0,0 @@
1  
-Subproject commit 6c11e2791f8bdb8ce6e90482a09b99f2277e2a7b
2  vim/ftdetect/markdown.vim
... ...
@@ -0,0 +1,2 @@
  1
+" Markdown
  2
+autocmd BufNewFile,BufRead *.{md,mkd,mkdn,mark*} set filetype=markdown
2  vim/ftdetect/percolate.vim
... ...
@@ -0,0 +1,2 @@
  1
+" Percolate
  2
+autocmd BufNewFile,BufRead *.{percolate,perc} set filetype=percolate ai formatoptions=tcroqn2 comments=n:&gt spell
11  vim/gvimrc
@@ -6,9 +6,8 @@ set antialias                     " MacVim: smooth fonts.
6 6
 set encoding=utf-8                " Use UTF-8 everywhere.
7 7
 set guioptions-=T                 " Hide toolbar.
8 8
 set background=light              " Background.
9  
-set lines=999 columns=999          " Window dimensions.
  9
+set lines=999 columns=999         " Window dimensions.
10 10
 
11  
-"set guioptions-=r                 " Don't show right scrollbar
12 11
 " Start without the toolbar
13 12
 set guioptions-=T
14 13
 
@@ -39,21 +38,15 @@ nmap <d-7> 7gt
39 38
 nmap <d-8> 8gt
40 39
 nmap <d-9> 9gt
41 40
 
42  
-" colorscheme jellybeans
43 41
 set background=dark
44 42
 colorscheme solarized
45  
-"colorscheme mango
  43
+
46 44
 " indent guides
47 45
 let g:indent_guides_auto_colors = 1
48  
-"autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd  guibg=#1A1A1A ctermbg=3
49  
-"autocmd VimEnter,Colorscheme * :hi IndentGuidesEven guibg=#111111 ctermbg=4
50 46
 
51 47
 nmap <silent> <leader>sv :so ~/.vimrc<CR>:so ~/.gvimrc<CR>
52 48
 nmap <silent> <leader>egv :e ~/.gvimrc<CR>
53 49
 
54  
-" Project Tree
55  
-" autocmd VimEnter * NERDTree
56  
-
57 50
 " Disable netrw's autocmd, since we're ALWAYS using NERDTree
58 51
 
59 52
 let g:NERDTreeHijackNetrw = 0
43  vim/snippets/markdown.snippets
... ...
@@ -0,0 +1,43 @@
  1
+# [link][]
  2
+snippet []
  3
+	[${1:link_id}][]${2}
  4
+# [link][id]
  5
+snippet [[
  6
+	[${1:link}][${2:id}]${3}
  7
+# [link](url)
  8
+snippet [(
  9
+	[${1:link}](http://${2:url})${3}
  10
+# [link](email)
  11
+snippet [@
  12
+	[${1:link}(mailto:${2:email})${3}
  13
+# [link](url "title")
  14
+snippet [("
  15
+	[${1:link}](${2:url} "${3:title}")${4}
  16
+# [id]: url "title"
  17
+snippet [:
  18
+	[${1:id}]: http://${2:url} "${3:title}"
  19
+# [id]: email "title"
  20
+snippet [:@
  21
+	[${1:id}]: mailto:${2:url} "${3:title}"
  22
+# ![alt][id]
  23
+snippet ![
  24
+	![${1:alt}][${2:id}]${3}
  25
+# ![alt](url)
  26
+snippet !(
  27
+	![${1:alt}](${2:url})${3}
  28
+# ![alt](url "title")
  29
+snippet !("
  30
+	![${1:alt}](${2:url} "${3:title}")${4}
  31
+# *emphasis* or _emphasis_
  32
+snippet *
  33
+	*${1}*${2}
  34
+snippet _
  35
+	_${1}_${2}
  36
+# **strong** or __strong__
  37
+snippet **
  38
+	**${1}**${2}
  39
+snippet __
  40
+	__${1}__${2}
  41
+# `code`
  42
+snippet `
  43
+	\`${1}\`${2}
5  vim/spell/en.utf-8.add
@@ -16,3 +16,8 @@ mixins
16 16
 EventEmitter
17 17
 accessor
18 18
 namespace
  19
+accessor's
  20
+memoizes
  21
+SetIndex
  22
+belongsTo
  23
+hasOne
BIN  vim/spell/en.utf-8.add.spl
Binary file not shown
111  vim/syntax/markdown.vim
... ...
@@ -0,0 +1,111 @@
  1
+" Vim syntax file
  2
+" Language:     Markdown
  3
+" Author:       Ben Williams <benw@plasticboy.com>
  4
+" Maintainer:   Hallison Batista <email@hallisonbatista.com>
  5
+" URL:          http://plasticboy.com/markdown-vim-mode/
  6
+" Version:      1.0.1
  7
+" Last Change:  Fri Dec  4 08:36:48 AMT 2009
  8
+" Remark:       Uses HTML syntax file
  9
+" Remark:       I don't do anything with angle brackets (<>) because that would too easily
  10
+"               easily conflict with HTML syntax
  11
+" TODO: Handle stuff contained within stuff (e.g. headings within blockquotes)
  12
+
  13
+" Read the HTML syntax to start with
  14
+if version < 600
  15
+  so <sfile>:p:h/html.vim
  16
+else
  17
+  runtime! syntax/html.vim
  18
+  unlet b:current_syntax
  19
+endif
  20
+
  21
+if version < 600
  22
+  syntax clear
  23
+elseif exists("b:current_syntax")
  24
+  finish
  25
+endif
  26
+
  27
+" Don't use standard HiLink, it will not work with included syntax files
  28
+if version < 508
  29
+  command! -nargs=+ HtmlHiLink hi link <args>
  30
+else
  31
+  command! -nargs=+ HtmlHiLink hi def link <args>
  32
+endif
  33
+
  34
+syntax spell toplevel
  35
+syntax case ignore
  36
+syntax sync linebreaks=1
  37
+
  38
+" Additions to HTML groups
  39
+syntax region htmlBold    start=/\\\@<!\(^\|\A\)\@=\*\@<!\*\*\*\@!\S/  end=/\S\\\@<!\*\@<!\*\*\*\@!\($\|\A\)\@=/  contains=htmlItalic,@Spell
  40
+
  41
+
  42
+syntax region htmlItalic  start=/\\\@<!\(^\|\A\)\@=\*\@<!\*\*\@!\S/    end=/\S\\\@<!\*\@<!\*\*\@!\($\|\A\)\@=/    contains=htmlBold,@Spell
  43
+syntax region htmlItalic  start=/\\\@<!\(^\|\A\)\@=\<_\@<!___\@!\S/      end=/\S\\\@<!_\@<!___\@!\($\|\A\)\@=/       contains=htmlBold,@Spell
  44
+syntax region htmlItalic  start=/\\\@<!\(^\|\A\)\@=\<_\@<!__\@!\S/       end=/\S\\\@<!_\@<!__\@!\($\|\A\)\@=/       contains=htmlBold,@Spell
  45
+
  46
+" [link](URL) | [link][id] | [link][]
  47
+syntax region mkdLink matchgroup=mkdDelimiter start="\!\?\["  end="\]\ze\s*[[(]" contains=@Spell nextgroup=mkdURL,mkdID skipwhite
  48
+syntax region mkdID   matchgroup=mkdDelimiter start="\["      end="\]" contained
  49
+syntax region mkdURL  matchgroup=mkdDelimiter start="("       end=")"  contained
  50
+
  51
+" Link definitions: [id]: URL (Optional Title)
  52
+" TODO handle automatic links without colliding with htmlTag (<URL>)
  53
+syntax region mkdLinkDef matchgroup=mkdDelimiter   start="^ \{,3}\zs\[" end="]:" oneline nextgroup=mkdLinkDefTarget skipwhite
  54
+syntax region mkdLinkDefTarget start="<\?\zs\S" excludenl end="\ze[>[:space:]\n]"   contained nextgroup=mkdLinkTitle,mkdLinkDef skipwhite skipnl oneline
  55
+syntax region mkdLinkTitle matchgroup=mkdDelimiter start=+"+     end=+"+  contained
  56
+syntax region mkdLinkTitle matchgroup=mkdDelimiter start=+'+     end=+'+  contained
  57
+syntax region mkdLinkTitle matchgroup=mkdDelimiter start=+(+     end=+)+  contained
  58
+
  59
+" Define Markdown groups
  60
+syntax match  mkdLineContinue ".$" contained
  61
+syntax match  mkdRule      /^\s*\*\s\{0,1}\*\s\{0,1}\*$/
  62
+syntax match  mkdRule      /^\s*-\s\{0,1}-\s\{0,1}-$/
  63
+syntax match  mkdRule      /^\s*_\s\{0,1}_\s\{0,1}_$/
  64
+syntax match  mkdRule      /^\s*-\{3,}$/
  65
+syntax match  mkdRule      /^\s*\*\{3,5}$/
  66
+syntax match  mkdListItem  /^\s*[-*+]\s\+.*\n\(\(^.\+\n\)*\n\?\)\(\(^\(\s\{4}\|\t\)\+.*\n\)\(^.\+\n\)*\n\?\)*/ contains=mkdListCode,mkdCode,htmlBold,htmlItalic,htmlSpecialChar
  67
+syntax match  mkdListItem  /^\s*\d\+\.\s\+.*\n\(\(^.\+\n\)*\n\?\)\(\(^\(\s\{4}\|\t\)\+.*\n\)\(^.\+\n\)*\n\?\)*/ contains=mkdListCode,mkdCode,htmlBold,htmlItalic,htmlSpecialChar
  68
+"
  69
+syntax match  mkdBlockCode  /^\s*\n\(^\(\s\{4}\|\t\).*\n\)\+/
  70
+syntax match  mkdListCode   /^\s*\n\(^\(\s\{8}\|\t{2}\).*\n\)\+/
  71
+syntax match  mkdLineBreak /  \+$/
  72
+syntax region mkdCode       start=/\\\@<!`/     end=/\\\@<!`/
  73
+syntax region mkdCode       start=/\s*``[^`]*/  end=/[^`]*``\s*/
  74
+syntax region mkdBlockquote start=/^\s*>/       end=/$/           contains=mkdLineBreak,mkdLineContinue,@Spell
  75
+syntax region mkdCode       start="<pre[^>]*>"  end="</pre>"
  76
+syntax region mkdCode       start="<code[^>]*>" end="</code>"
  77
+syntax region mkdCode       start=/^`\{3,3}\s*\w*\s*$/  end=/^`\{3,3}\s*$/
  78
+
  79
+" HTML headings
  80
+syntax region htmlH1       start="^\s*#"                   end="\($\|#\+\)" contains=@Spell
  81
+syntax region htmlH2       start="^\s*##"                  end="\($\|#\+\)" contains=@Spell
  82
+syntax region htmlH3       start="^\s*###"                 end="\($\|#\+\)" contains=@Spell
  83
+syntax region htmlH4       start="^\s*####"                end="\($\|#\+\)" contains=@Spell
  84
+syntax region htmlH5       start="^\s*#####"               end="\($\|#\+\)" contains=@Spell
  85
+syntax region htmlH6       start="^\s*######"              end="\($\|#\+\)" contains=@Spell
  86
+syntax match  htmlH1       /^.\+\n=\+$/ contains=@Spell
  87
+syntax match  htmlH2       /^.\+\n-\+$/ contains=@Spell
  88
+
  89
+"highlighting for Markdown groups
  90
+HtmlHiLink mkdString        String
  91
+HtmlHiLink mkdCode          String
  92
+HtmlHiLink mkdListCode      String
  93
+HtmlHiLink mkdBlockCode     String
  94
+HtmlHiLink mkdBlockquote    Comment
  95
+HtmlHiLink mkdLineContinue  Comment
  96
+HtmlHiLink mkdListItem      Identifier
  97
+HtmlHiLink mkdRule          Identifier
  98
+HtmlHiLink mkdLineBreak     Todo
  99
+HtmlHiLink mkdLink          htmlLink
  100
+HtmlHiLink mkdURL           htmlString
  101
+HtmlHiLink mkdID            Identifier
  102
+HtmlHiLink mkdLinkDef       mkdID
  103
+HtmlHiLink mkdLinkDefTarget mkdURL
  104
+HtmlHiLink mkdLinkTitle     htmlString
  105
+
  106
+HtmlHiLink mkdDelimiter     Delimiter
  107
+
  108
+let b:current_syntax = "markdown"
  109
+
  110
+delcommand HtmlHiLink
  111
+" vim: tabstop=2
104  vim/syntax/mkd.vim
... ...
@@ -1,104 +0,0 @@
1  
-" Vim syntax file
2  
-" Language:	Markdown
3  
-" Maintainer:	Ben Williams <benw@plasticboy.com>
4  
-" URL:		http://plasticboy.com/markdown-vim-mode/
5  
-" Version:	9
6  
-" Last Change:  2009 May 18 
7  
-" Remark:	Uses HTML syntax file
8  
-" Remark:	I don't do anything with angle brackets (<>) because that would too easily
9  
-"		easily conflict with HTML syntax
10  
-" TODO: 	Handle stuff contained within stuff (e.g. headings within blockquotes)
11  
-
12  
-
13  
-" Read the HTML syntax to start with
14  
-if version < 600
15  
-  so <sfile>:p:h/html.vim
16  
-else
17  
-  runtime! syntax/html.vim
18  
-  unlet b:current_syntax
19  
-endif
20  
-
21  
-if version < 600
22  
-  syntax clear
23  
-elseif exists("b:current_syntax")
24  
-  finish
25  
-endif
26  
-
27  
-" don't use standard HiLink, it will not work with included syntax files
28  
-if version < 508
29  
-  command! -nargs=+ HtmlHiLink hi link <args>
30  
-else
31  
-  command! -nargs=+ HtmlHiLink hi def link <args>
32  
-endif
33  
-
34  
-syn spell toplevel
35  
-syn case ignore
36  
-syn sync linebreaks=1
37  
-
38  
-"additions to HTML groups
39  
-syn region htmlBold     start=/\\\@<!\(^\|\A\)\@=\*\@<!\*\*\*\@!/     end=/\\\@<!\*\@<!\*\*\*\@!\($\|\A\)\@=/   contains=@Spell,htmlItalic
40  
-syn region htmlItalic   start=/\\\@<!\(^\|\A\)\@=\*\@<!\*\*\@!/       end=/\\\@<!\*\@<!\*\*\@!\($\|\A\)\@=/      contains=htmlBold,@Spell
41  
-syn region htmlBold     start=/\\\@<!\(^\|\A\)\@=_\@<!___\@!/         end=/\\\@<!_\@<!___\@!\($\|\A\)\@=/       contains=htmlItalic,@Spell
42  
-syn region htmlItalic   start=/\\\@<!\(^\|\A\)\@=_\@<!__\@!/          end=/\\\@<!_\@<!__\@!\($\|\A\)\@=/        contains=htmlBold,@Spell
43  
-
44  
-" [link](URL) | [link][id] | [link][]
45  
-syn region mkdLink matchgroup=mkdDelimiter      start="\!\?\[" end="\]\ze\s*[[(]" contains=@Spell nextgroup=mkdURL,mkdID skipwhite oneline
46  
-syn region mkdID matchgroup=mkdDelimiter        start="\["    end="\]" contained
47  
-syn region mkdURL matchgroup=mkdDelimiter       start="("     end=")"  contained
48  
-
49  
-" Link definitions: [id]: URL (Optional Title)
50  
-" TODO handle automatic links without colliding with htmlTag (<URL>)
51  
-syn region mkdLinkDef matchgroup=mkdDelimiter   start="^ \{,3}\zs\[" end="]:" oneline nextgroup=mkdLinkDefTarget skipwhite
52  
-syn region mkdLinkDefTarget start="<\?\zs\S" excludenl end="\ze[>[:space:]\n]"   contained nextgroup=mkdLinkTitle,mkdLinkDef skipwhite skipnl oneline
53  
-syn region mkdLinkTitle matchgroup=mkdDelimiter start=+"+     end=+"+  contained
54  
-syn region mkdLinkTitle matchgroup=mkdDelimiter start=+'+     end=+'+  contained
55  
-syn region mkdLinkTitle matchgroup=mkdDelimiter start=+(+     end=+)+  contained
56  
-
57  
-"define Markdown groups
58  
-syn match  mkdLineContinue ".$" contained
59  
-syn match  mkdRule      /^\s*\*\s\{0,1}\*\s\{0,1}\*$/
60  
-syn match  mkdRule      /^\s*-\s\{0,1}-\s\{0,1}-$/
61  
-syn match  mkdRule      /^\s*_\s\{0,1}_\s\{0,1}_$/
62  
-syn match  mkdRule      /^\s*-\{3,}$/
63  
-syn match  mkdRule      /^\s*\*\{3,5}$/
64  
-syn match  mkdListItem  "^\s*[-*+]\s\+"
65  
-syn match  mkdListItem  "^\s*\d\+\.\s\+"
66  
-syn match  mkdCode      /^\s*\n\(\(\s\{4,}[^ ]\|\t\+[^\t]\).*\n\)\+/
67  
-syn match  mkdLineBreak /  \+$/
68  
-syn region mkdCode      start=/\\\@<!`/                   end=/\\\@<!`/
69  
-syn region mkdCode      start=/\s*``[^`]*/          end=/[^`]*``\s*/
70  
-syn region mkdBlockquote start=/^\s*>/              end=/$/                 contains=mkdLineBreak,mkdLineContinue,@Spell
71  
-syn region mkdCode      start="<pre[^>]*>"         end="</pre>"
72  
-syn region mkdCode      start="<code[^>]*>"        end="</code>"
73  
-
74  
-"HTML headings
75  
-syn region htmlH1       start="^\s*#"                   end="\($\|#\+\)" contains=@Spell
76  
-syn region htmlH2       start="^\s*##"                  end="\($\|#\+\)" contains=@Spell
77  
-syn region htmlH3       start="^\s*###"                 end="\($\|#\+\)" contains=@Spell
78  
-syn region htmlH4       start="^\s*####"                end="\($\|#\+\)" contains=@Spell
79  
-syn region htmlH5       start="^\s*#####"               end="\($\|#\+\)" contains=@Spell
80  
-syn region htmlH6       start="^\s*######"              end="\($\|#\+\)" contains=@Spell
81  
-syn match  htmlH1       /^.\+\n=\+$/ contains=@Spell
82  
-syn match  htmlH2       /^.\+\n-\+$/ contains=@Spell
83  
-
84  
-"highlighting for Markdown groups
85  
-HtmlHiLink mkdString	    String
86  
-HtmlHiLink mkdCode          String
87  
-HtmlHiLink mkdBlockquote    Comment
88  
-HtmlHiLink mkdLineContinue  Comment
89  
-HtmlHiLink mkdListItem      Identifier
90  
-HtmlHiLink mkdRule          Identifier
91  
-HtmlHiLink mkdLineBreak     Todo
92  
-HtmlHiLink mkdLink          htmlLink
93  
-HtmlHiLink mkdURL           htmlString
94  
-HtmlHiLink mkdID            Identifier
95  
-HtmlHiLink mkdLinkDef       mkdID
96  
-HtmlHiLink mkdLinkDefTarget mkdURL
97  
-HtmlHiLink mkdLinkTitle     htmlString
98  
-
99  
-HtmlHiLink mkdDelimiter     Delimiter
100  
-
101  
-let b:current_syntax = "mkd"
102  
-
103  
-delcommand HtmlHiLink
104  
-" vim: ts=8
130  vim/syntax/percolate.vim
... ...
@@ -1,17 +1,121 @@
1  
-let b:current_syntax = ''
2  
-unlet b:current_syntax
3  
-runtime! syntax/mkd.vim
  1
+" Vim syntax file
  2
+" Language:     Markdown
  3
+" Author:       Ben Williams <benw@plasticboy.com>
  4
+" Maintainer:   Hallison Batista <email@hallisonbatista.com>
  5
+" URL:          http://plasticboy.com/markdown-vim-mode/
  6
+" Version:      1.0.1
  7
+" Last Change:  Fri Dec  4 08:36:48 AMT 2009
  8
+" Remark:       Uses HTML syntax file
  9
+" Remark:       I don't do anything with angle brackets (<>) because that would too easily
  10
+"               easily conflict with HTML syntax
  11
+" TODO: Handle stuff contained within stuff (e.g. headings within blockquotes)
4 12
 
5  
-let b:current_syntax = ''
6  
-unlet b:current_syntax
7  
-syntax include @Markdown syntax/markdown.vim
  13
+" Read the HTML syntax to start with
  14
+if version < 600
  15
+  so <sfile>:p:h/html.vim
  16
+else
  17
+  syntax include @Coffee syntax/coffee.vim
  18
+  unlet b:current_syntax
  19
+  syntax include @JavaScript syntax/javascript.vim
  20
+  unlet b:current_syntax
  21
+  runtime! syntax/html.vim
  22
+  unlet b:current_syntax
  23
+  syntax include @Html syntax/html.vim
  24
+  unlet b:current_syntax
  25
+endif
8 26
 
9  
-let b:current_syntax = ''
10  
-unlet b:current_syntax
11  
-syntax include @Coffee syntax/coffee.vim
12  
-syntax region coffeeScriptCode matchgroup=Snip start="\~\~\~" end="\~\~\~" containedin=@Markdown contains=@Coffee
  27
+if version < 600
  28
+  syntax clear
  29
+elseif exists("b:current_syntax")
  30
+  finish
  31
+endif
13 32
 
14  
-syn region markdownCoffeeCodeBlock start="    \|\t" end="$" containedin=@Markdown contains=@Coffee
15 33
 
16  
-hi link Snip SpecialComment
17  
-let b:current_syntax = 'percolate'
  34
+" Don't use standard HiLink, it will not work with included syntax files
  35
+if version < 508
  36
+  command! -nargs=+ HtmlHiLink hi link <args>
  37
+else
  38
+  command! -nargs=+ HtmlHiLink hi def link <args>
  39
+endif
  40
+
  41
+syntax spell toplevel
  42
+syntax case ignore
  43
+syntax sync linebreaks=1
  44
+
  45
+" Additions to HTML groups
  46
+syntax region htmlBold    start=/\\\@<!\(^\|\A\)\@=\*\@<!\*\*\*\@!\S/  end=/\S\\\@<!\*\@<!\*\*\*\@!\($\|\A\)\@=/  contains=htmlItalic,@Spell
  47
+
  48
+syntax region htmlItalic  start=/\\\@<!\(^\|\A\)\@=\*\@<!\*\*\@!\S/    end=/\S\\\@<!\*\@<!\*\*\@!\($\|\A\)\@=/    contains=htmlBold,@Spell
  49
+syntax region htmlItalic  start=/\\\@<!\(^\|\A\)\@=\<_\@<!___\@!\S/      end=/\S\\\@<!_\@<!___\@!\($\|\A\)\@=/       contains=htmlBold,@Spell
  50
+syntax region htmlItalic  start=/\\\@<!\(^\|\A\)\@=\<_\@<!__\@!\S/       end=/\S\\\@<!_\@<!__\@!\($\|\A\)\@=/       contains=htmlBold,@Spell
  51
+
  52
+" [link](URL) | [link][id] | [link][]
  53
+syntax region mkdLink matchgroup=mkdDelimiter start="\!\?\["  end="\]\ze\s*[[(]" contains=@Spell nextgroup=mkdURL,mkdID skipwhite
  54
+syntax region mkdID   matchgroup=mkdDelimiter start="\["      end="\]" contained
  55
+syntax region mkdURL  matchgroup=mkdDelimiter start="("       end=")"  contained
  56
+
  57
+" Link definitions: [id]: URL (Optional Title)
  58
+" TODO handle automatic links without colliding with htmlTag (<URL>)
  59
+syntax region mkdLinkDef matchgroup=mkdDelimiter   start="^ \{,3}\zs\[" end="]:" oneline nextgroup=mkdLinkDefTarget skipwhite
  60
+syntax region mkdLinkDefTarget start="<\?\zs\S" excludenl end="\ze[>[:space:]\n]"   contained nextgroup=mkdLinkTitle,mkdLinkDef skipwhite skipnl oneline
  61
+syntax region mkdLinkTitle matchgroup=mkdDelimiter start=+"+     end=+"+  contained
  62
+syntax region mkdLinkTitle matchgroup=mkdDelimiter start=+'+     end=+'+  contained
  63
+syntax region mkdLinkTitle matchgroup=mkdDelimiter start=+(+     end=+)+  contained
  64
+
  65
+" Define Markdown groups
  66
+syntax match  mkdLineContinue ".$" contained
  67
+syntax match  mkdRule      /^\s*\*\s\{0,1}\*\s\{0,1}\*$/
  68
+syntax match  mkdRule      /^\s*-\s\{0,1}-\s\{0,1}-$/
  69
+syntax match  mkdRule      /^\s*_\s\{0,1}_\s\{0,1}_$/
  70
+syntax match  mkdRule      /^\s*-\{3,}$/
  71
+syntax match  mkdRule      /^\s*\*\{3,5}$/
  72
+syntax match  mkdListItem  /^\s*[-*+]\s\+.*\n\(\(^.\+\n\)*\n\?\)\(\(^\(\s\{4}\|\t\)\+.*\n\)\(^.\+\n\)*\n\?\)*/ contains=mkdListCode,mkdCode,htmlBold,htmlItalic,htmlSpecialChar
  73
+syntax match  mkdListItem  /^\s*\d\+\.\s\+.*\n\(\(^.\+\n\)*\n\?\)\(\(^\(\s\{4}\|\t\)\+.*\n\)\(^.\+\n\)*\n\?\)*/ contains=mkdListCode,mkdCode,htmlBold,htmlItalic,htmlSpecialChar
  74
+"
  75
+syntax match  mkdBlockCode  /^\s*\n\(^\(\s\{4}\|\t\).*\n\)\+/
  76
+syntax match  mkdListCode   /^\s*\n\(^\(\s\{8}\|\t{2}\).*\n\)\+/
  77
+syntax match  mkdLineBreak /  \+$/
  78
+syntax region mkdCode       start=/\\\@<!`/     end=/\\\@<!`/
  79
+syntax region mkdCode       start=/\s*``[^`]*/  end=/[^`]*``\s*/
  80
+syntax region mkdBlockquote start=/^\s*>/       end=/$/           contains=mkdLineBreak,mkdLineContinue,@Spell
  81
+syntax region mkdCode       start="<pre[^>]*>"  end="</pre>"
  82
+syntax region mkdCode       start="<code[^>]*>" end="</code>"
  83
+syntax region mkdCode       start=/^`\{3,3}\s*\w*\s*$/  end=/^`\{3,3}\s*$/
  84
+
  85
+syntax region htmlCode         matchgroup=mkdCode start=/^`\{3,3}\s*html*\s*$/          end=/^`\{3,3}\s*$/ contains=@html keepend
  86
+syntax region coffeeScriptCode matchgroup=mkdCode start=/^`\{3,3}\s*coffeescript*\s*$/  end=/^`\{3,3}\s*$/ contains=@Coffee keepend
  87
+
  88
+syntax region percolateCoffeeCode     matchgroup=mkdDelimiter start=/^!\{3,3}\s*\(coffeescript\)\?\s*$/  end=/^!\{3,3}\s*$/ contains=@Coffee keepend
  89
+syntax region percolateJavaScriptCode matchgroup=mkdDelimiter start=/^!\{3,3}\s*javascript*\s*$/         end=/^!\{3,3}\s*$/ contains=@JavaScript keepend
  90
+
  91
+" HTML headings
  92
+syntax region htmlH1       start="^\s*\(#\|-\|=\)"           end="\($\|\(#\|-\|=\)\+\)" contains=@Spell
  93
+syntax region htmlH2       start="^\s*\(#\|-\|=\)\{2,2}"     end="\($\|\(#\|-\|=\)\+\)" contains=@Spell
  94
+syntax region htmlH3       start="^\s*\(#\|-\|=\)\{3,3}"     end="\($\|\(#\|-\|=\)\+\)" contains=@Spell
  95
+syntax region htmlH4       start="^\s*\(#\|-\|=\)\{4,4}"     end="\($\|\(#\|-\|=\)\+\)" contains=@Spell
  96
+syntax region htmlH5       start="^\s*\(#\|-\|=\)\{5,5}"     end="\($\|\(#\|-\|=\)\+\)" contains=@Spell
  97
+syntax region htmlH6       start="^\s*\(#\|-\|=\)\{6,6}"     end="\($\|\(#\|-\|=\)\+\)" contains=@Spell
  98
+
  99
+"highlighting for Markdown groups
  100
+HtmlHiLink mkdString        Comment
  101
+HtmlHiLink mkdCode          String
  102
+HtmlHiLink mkdListCode      String
  103
+HtmlHiLink mkdBlockCode     String
  104
+HtmlHiLink mkdBlockquote    Comment
  105
+HtmlHiLink mkdLineContinue  Comment
  106
+HtmlHiLink mkdRule          Identifier
  107
+HtmlHiLink mkdListItem      Identifier
  108
+HtmlHiLink mkdLineBreak     Todo
  109
+HtmlHiLink mkdLink          htmlLink
  110
+HtmlHiLink mkdURL           htmlString
  111
+HtmlHiLink mkdID            Identifier
  112
+HtmlHiLink mkdLinkDef       mkdID
  113
+HtmlHiLink mkdLinkDefTarget mkdURL
  114
+HtmlHiLink mkdLinkTitle     htmlString
  115
+
  116
+HtmlHiLink mkdDelimiter     Delimiter
  117
+
  118
+let b:current_syntax = "percolate"
  119
+
  120
+delcommand HtmlHiLink
  121
+" vim: tabstop=2
22  vim/vimrc
@@ -110,8 +110,7 @@ au BufNewFile,BufRead *.coffee IndentGuidesEnable
110 110
 au BufNewFile,BufRead *.py IndentGuidesEnable
111 111
 
112 112
 " Markdown handy stuff
113  
-au BufRead,BufNewFile *.{md,markdown,mdown,mkd,mkdn,percolate} set ft=markdown ai formatoptions=tcroqn2 comments=n:&gt spell
114  
-au BufRead,BufNewFile *.percolate set syntax=percolate
  113
+au BufRead,BufNewFile *.{md,markdown,mdown,mkd,mkdn} set ai formatoptions=tcroqn2 comments=n:&gt spell
115 114
 
116 115
 " Closetags
117 116
 autocmd FileType html,htmldjango,jinjahtml,eruby,mako let b:closetag_html_style=1
@@ -162,11 +161,11 @@ inoremap <Up> <C-o>gk
162 161
 inoremap jj <ESC>
163 162
 
164 163
 " Remove debugger lines
165  
-nmap <silent> <leader>rd :%s/\v.*debugger.*\n//<CR>:noh<CR>
  164
+nnoremap <silent> <leader>rd :%s/\v.*debugger.*\n//<CR>:noh<CR>
166 165
 
167 166
 " Quickly edit/reload the vimrc file
168  
-nmap <silent> <leader>ev :e ~/.vimrc<CR>
169  
-nmap <silent> <leader>sv :so ~/.vimrc<CR>
  167
+nnoremap <silent> <leader>ev :e ~/.vimrc<CR>
  168
+nnoremap <silent> <leader>sv :so ~/.vimrc<CR>
170 169
 
171 170
 " NERDTree configuration
172 171
 let NERDTreeIgnore=['\.rbc$', '\~$']
@@ -188,6 +187,8 @@ let g:closetag_html_style=1
188 187
 " Syntastic conf
189 188
 let g:syntastic_enable_signs=1
190 189
 
  190
+" Swap words around punctuation
  191
+nnoremap <silent> <Leader>x "_yiw:s/\(\%#\w\+\)\(\_W\+\)\(\w\+\)/\3\2\1/<CR><c-o>/\w\+\_W\+<CR><c-l>
191 192
 
192 193
 " Indentations while keeping selection
193 194
 nmap <D-[> <<
@@ -195,9 +196,6 @@ nmap <D-]> >>
195 196
 vmap <D-[> <gv
196 197
 vmap <D-]> >gv
197 198
 
198  
-set lines=999
199  
-set columns=999
200  
-
201 199
 " Save a file as root.
202 200
 cabbrev w!! w !sudo tee % > /dev/null<CR>:e!<CR><CR>
203 201
 
@@ -224,12 +222,12 @@ function! OpenURI()
224 222
   :ruby open_uri
225 223
 endfunction
226 224
 
227  
-" SCMDiff options
228  
-let g:SCMDiffCommand='git'
229  
-
230 225
 " Open URL from this line (OS X only).
231 226
 map <leader>u :call OpenURI()<CR>
232 227
 
  228
+" SCMDiff options
  229
+let g:SCMDiffCommand='git'
  230
+
233 231
 " Ctags handy helpers
234 232
 " Open in new tab
235 233
 map <C-\> :tab split<CR>:exec("tag ".expand("<cword>"))<CR>
@@ -249,5 +247,5 @@ let g:tagbar_type_coffee = {
249 247
 \},
250 248
 \ 'sro' : ".",
251 249
 \ 'ctagsbin' : 'coffeetags',
252  
-\ 'ctagsargs' : '--include-vars ',
  250
+\ 'ctagsargs' : '',
253 251
 \}

No commit comments for this range

Something went wrong with that request. Please try again.