Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Move vim config to it's own submodule

  • Loading branch information...
commit 57aa7178f9d736cbf9e091853cfac437c7e246d0 1 parent 6a6bff4
@randymorris authored
View
6 .gitmodules
@@ -1,3 +1,3 @@
-[submodule "vim/vundle"]
- path = vim/vundle
- url = http://github.com/gmarik/vundle
+[submodule "vimfiles"]
+ path = vimfiles
+ url = git@github.com:rson/vimfiles.git
View
80 vim/colors/darkdot.vim
@@ -1,80 +0,0 @@
-" Vim color file
-" Maintainer: David Lazar <david#c7.campus.utcluj.ro>
-" Last Change: Thu May 20 16:27:13 EEST 2004
-" Version: 2.2
-" URL: http://www.c7obs.net/~david/stuff/darkdot.vim
-"
-" This colorscheme script was created using Hans Fugal's colorscheme template
-
-set background=dark
-hi clear
-if exists("syntax_on")
- syntax reset
-endif
-let g:colors_name="darkdot"
-
-hi Normal cterm=none gui=none guibg=#101020 guifg=#a8aaaa
-hi Cursor cterm=none guibg=#44ff44 guifg=#000000
-hi link CursorIM Cursor
-hi Directory ctermfg=cyan guifg=#44ffff
-hi DiffAdd ctermbg=blue ctermfg=yellow guibg=#080888 guifg=#ffff00
-hi DiffDelete ctermbg=black ctermfg=darkgray guibg=#080808 guifg=#444444
-hi DiffChange ctermbg=black guibg=#080808 guifg=#ffffff
-hi DiffText ctermbg=black ctermfg=darkred guibg=#080808 guifg=#bb0000
-hi ErrorMsg ctermbg=darkred ctermfg=white guibg=#880000 guifg=#ffffff
-hi Folded ctermbg=none ctermfg=darkblue guibg=black guifg=#000088
-hi link FoldColumn Folded
-hi IncSearch ctermbg=black ctermfg=gray guibg=#000000 guifg=#bbcccc
-hi LineNr ctermfg=darkblue guibg=#404040 guifg=#ffff00
-hi ModeMsg ctermfg=white guifg=#ffffff
-hi MoreMsg ctermfg=green guifg=#44ff44
-hi NonText ctermfg=darkgray guifg=#4444ff
-hi Question ctermfg=yellow guifg=#ffff00
-hi Search ctermbg=NONE ctermfg=green guibg=NONE guifg=green
-hi SpecialKey ctermfg=darkgray guifg=#4444ff
-hi StatusLine cterm=none ctermbg=none ctermfg=grey gui=none guibg=#00aaaa guifg=#ffffff
-hi StatusLineNC cterm=none ctermbg=black ctermfg=black gui=none guibg=#bbbbbb guifg=#000000
-hi link VertSplit StatusLineNC
-hi Title ctermfg=white guifg=#ffffff
-hi Visual cterm=none ctermbg=gray ctermfg=black gui=none guibg=#bbbbbb guifg=#000000
-hi link VisualNOS Visual
-hi WarningMsg ctermfg=yellow guifg=#ffff00
-"hi WildMenu
-"hi Menu
-"hi Scrollbar
-"hi Tooltip
-
-" syntax highlighting groups
-hi Comment ctermfg=blue guifg=#4444ff
-hi Constant ctermfg=darkcyan guifg=#00aaaa
-hi Identifier ctermfg=white guifg=#ffffff
-hi Statement ctermfg=cyan guifg=#44ffff
-hi PreProc ctermfg=darkcyan guifg=#00aaaa
-hi Type ctermfg=white guifg=#ffffff
-hi Special ctermfg=blue cterm=bold guifg=#6666ff gui=bold
-hi Underlined ctermfg=blue guifg=#4444ff
-hi Ignore ctermfg=darkgray guifg=#444444
-hi Error ctermbg=black ctermfg=darkred guibg=#000000 guifg=#bb0000
-hi Todo ctermbg=darkred ctermfg=yellow guibg=#aa0006 guifg=#fff300
-
-hi link Character Constant
-hi link Number Constant
-hi link Boolean Constant
-hi link Float Number
-hi link Conditional Statement
-hi link Label Statement
-hi link Keyword Statement
-hi link Exception Statement
-hi link Repeat Statement
-hi link Include PreProc
-hi link Define PreProc
-hi link Macro PreProc
-hi link PreCondit PreProc
-hi link StorageClass Type
-hi link Structure Type
-hi link Typedef Type
-hi link Tag Special
-hi link Delimiter Special
-hi link SpecialComment Special
-hi link Debug Special
-hi link FoldColumn Folded
View
95 vim/colors/xoria256-mod.vim
@@ -1,95 +0,0 @@
-" Name: xoria256-mod.vim
-" Version: 1.1
-" Maintainer: Dmitriy Y. Zotikov (xio) <xio@ungrund.org>
-"
-" Should work in recent 256 color terminals. 88-color terms like urxvt are
-" unsupported.
-"
-" Don't forget to install 'ncurses-term' and set TERM to xterm-256color or
-" similar value.
-"
-" Color numbers (0-255) see:
-" http://www.calmar.ws/vim/256-xterm-24bit-rgb-color-chart.html
-
-
-
-" Bla-bla ----------------------------------------------------------------------
-
-if &t_Co != 256 && ! has("gui_running")
- echomsg ""
- echomsg "err: please use GUI or a 256-color terminal (so that t_Co=256 could be set)"
- echomsg ""
- finish
-endif
-
-set background=dark
-
-hi clear
-
-if exists("syntax_on")
- syntax reset
-endif
-
-let colors_name = "xoria256-mod"
-
-
-
-" The real part ----------------------------------------------------------------
-
-"" General colors
-hi Normal ctermfg=251 guifg=#d0d0d0 ctermbg=234 guibg=#1c1c1c cterm=none gui=none
-hi CursorColumn ctermbg=238 guibg=#444444
-hi Cursor ctermbg=214 guibg=#ffaf00
-hi CursorLine cterm=none term=none ctermbg=238 guibg=#444444
-hi FoldColumn ctermfg=248 guifg=#a8a8a8 ctermbg=bg guibg=bg
-hi Folded ctermfg=173 guifg=#af5f00 guibg=#1c1c1c ctermbg=none
-hi IncSearch ctermfg=0 guifg=#000000 ctermbg=223 guibg=#ffdfaf cterm=none gui=none
-hi NonText ctermfg=237 guifg=#a8a8a8 cterm=bold gui=bold
-hi Pmenu ctermfg=0 guifg=#000000 ctermbg=246 guibg=#949494
-hi PmenuSbar ctermbg=243 guibg=#767676
-hi PmenuSel ctermfg=0 guifg=#000000 ctermbg=243 guibg=#767676
-hi PmenuThumb ctermbg=252 guibg=#d0d0d0
-hi Search ctermfg=0 guifg=#000000 ctermbg=149 guibg=#afdf5f
-hi SignColumn ctermfg=248 guifg=#a8a8a8
-hi SpecialKey ctermfg=237 guifg=#5fdf5f
-hi StatusLine ctermbg=239 guibg=#4e4e4e cterm=bold gui=bold
-hi StatusLineNC ctermbg=237 guibg=#3a3a3a cterm=none gui=none
-hi TabLine ctermfg=fg guifg=fg ctermbg=242 guibg=#666666 cterm=underline gui=underline
-hi TabLineFill ctermfg=fg guifg=fg ctermbg=242 guibg=#666666 cterm=underline gui=underline
-hi VertSplit ctermfg=237 guifg=#3a3a3a ctermbg=237 guibg=#3a3a3a cterm=none gui=none
-hi Visual ctermfg=24 guifg=#005f87 ctermbg=153 guibg=#afdfff
-hi VisualNOS ctermfg=24 guifg=#005f87 ctermbg=153 guibg=#afdfff cterm=none gui=none
-hi WildMenu ctermfg=0 guifg=#000000 ctermbg=184 guibg=#dfdf00 cterm=bold gui=bold
-
-"" Syntax highlighting
-hi Comment ctermfg=244 guifg=#808080
-hi Constant ctermfg=229 guifg=#ffffaf
-hi Error ctermfg=15 guifg=#ffffff ctermbg=1 guibg=#800000
-hi ErrorMsg ctermfg=15 guifg=#ffffff ctermbg=1 guibg=#800000
-hi Identifier ctermfg=182 guifg=#dfafdf cterm=none
-hi Ignore ctermfg=238 guifg=#444444
-hi LineNr ctermfg=248 guifg=#a8a8a8
-hi MatchParen ctermfg=188 guifg=#dfdfdf ctermbg=68 guibg=#5f87df cterm=bold gui=bold
-hi Number ctermfg=180 guifg=#dfaf87
-hi PreProc ctermfg=150 guifg=#afdf87
-hi Special ctermfg=174 guifg=#df8787
-hi Statement ctermfg=110 guifg=#87afdf cterm=none gui=none
-hi String ctermfg=152
-hi Todo ctermfg=0 guifg=#000000 ctermbg=184 guibg=#dfdf00
-hi Type ctermfg=146 guifg=#afafdf cterm=none gui=none
-hi Underlined ctermfg=39 guifg=#00afff cterm=underline gui=underline
-
-"" Special
-hi Indent ctermfg=0 ctermbg=236
-""" .diff
-hi diffAdded ctermfg=150 guifg=#afdf87
-hi diffRemoved ctermfg=174 guifg=#df8787
-""" vimdiff
-hi diffAdd ctermfg=bg guifg=bg ctermbg=151 guibg=#afdfaf
-"hi diffDelete ctermfg=bg guifg=bg ctermbg=186 guibg=#dfdf87 cterm=none gui=none
-hi diffDelete ctermfg=bg guifg=bg ctermbg=246 guibg=#949494 cterm=none gui=none
-hi diffChange ctermfg=bg guifg=bg ctermbg=181 guibg=#dfafaf
-hi diffText ctermfg=bg guifg=bg ctermbg=174 guibg=#df8787 cterm=none gui=none
-
-" vim: set expandtab tabstop=2 shiftwidth=2 smarttab softtabstop=2:
-
View
137 vim/ftplugin/python/pydoc.vim
@@ -1,137 +0,0 @@
-" pydoc.vim 0.4 (initial public version)
-" Allow the user to pull pydoc information into Vim
-" Mike Repass <theopenroad@gmail.com>
-" October 2004
-
-" USAGE:
-" Put this in ftplugin/python/ or just manually source it using a FileType
-" autocommand in your vimrc. It registers the command Pydoc (try ':Pydoc re'
-" for regular expression docs). Also, it remaps K so that you can position the
-" cursor over a module or module.method etc and hit K to bring up the docs.
-" Make sure PYDOC_CMD points to the pydoc script. I use a 'pydoc.bat' batch
-" file on my WinXP system.
-"
-" A nice little side effect of using this is that the documentation buffers
-" become sources for keyword completion. For instance, say you're working on a
-" program that uses urllib2 and you're having trouble remembering the methods.
-" Simply do a ':Pydoc urllib2' and close the window. The buffer will remain
-" hidden and Ctrl-N and Ctrl-P will pick up all the text when you need to
-" complete.
-"
-" Btw just doing ':Pydoc modules' should bring up a list of all available
-" modules. Very handy just to leave open, as you can now just press 'K' over a
-" module to load it up.
-
-" NOTES:
-" The 'cleanest' or most 'pythonic' way to do this would be use the
-" vim-python interface and write some supporting python code to manually
-" import pydoc and call the associated functions. However, I don't always use
-" the version of python for which my vim is compiled, so I decided to
-" externally call the pydoc script. Also, it sets up the buffers to go
-" 'hidden' when closed, so that when you do the same Pydoc command again, it
-" will load the buffer and thus avoid the overhead of the external call
-" (basically a cheap cache system). If you don't want this, set the NO_HIDE
-" option to 1.
-
-" BUGS:
-" I am not aware of any major bugs, but of course there are some minor
-" interface glitches. For instance, if you put the cursor over an operator
-" which also has significance in your particular shell, invoking the command
-" might result in a shell error. I feel having some little 'oopses' like this
-" is pretty inevitable, but I'll be happy to work on anything that causes you
-" problems. If you come across any bug you feel impairs your ability to use
-" Vim, drop me an email and I'll get right on it.
-
-" OPTIONS:
-let s:PYDOC_CMD = "pydoc" " this must point to the pydoc script
-let s:NO_HIDE = 1 " when 1, pydoc buffers will be deleted (instead of hidden)
-
-" command interface
-com! -nargs=+ Pydoc call <SID>:PydocLoad("<args>")
-
-" remap the K (or 'help') key
-nnoremap <silent> <buffer> K :call <SID>:KeyPydocLoad(expand("<cWORD>"))<Cr>
-
-" prepares the cWORD argument for PydocLoad...
-func! <SID>:KeyPydocLoad(cword)
- " make sure we got something
- if a:cword == ""
- return
- endif
- " we want the current WORD just up to the first parenthesis
- " this allows us to get math.acos from math.acos(.2) etc
- let prep = substitute(a:cword, "\(.*", "", "")
- call <SID>:PydocLoad(prep)
-endfunc
-
-" opens a new buffer, filling it with the result of calling pydoc with pyargs
-func! <SID>:PydocLoad(pyargs)
- " first, check if we've already loaded the pydoc info for this search and
- " if so, open it and bail... this creates an ad hoc caching mechanism
-" let window_name = "pydoc\ -\ " . a:pyargs
- let window_name = "__doc__"
- if bufloaded(window_name)
- exec "new " . window_name
- return
- endif
-
- " build and execute the command
-" let cmd = "new " . escape(window_name, " ")
-" let cmd = cmd . " | r!" . escape(s:PYDOC_CMD, " ")
- let cmd = "new __doc__ | r!" . escape(s:PYDOC_CMD, " ")
- let cmd = cmd . " " . escape(a:pyargs, " ")
-
- try
- silent exec cmd
- catch
- redraw |
- \ echohl WarningMSG |
- \ echomsg "Error occurred while attempting to invoke Pydoc." |
- \ echohl None
- return
- endtry
-
-
- " make sure the command succeeded and we're in the right buffer
- if bufname("") != "__doc__"
- " hmmm something didn't work... lets bail
- return
- endif
-
- " roll back, delete empty lines at beginning
- normal gg
- while getline(1) =~ "^\s\*$"
- normal dd
- endwhile
-
- " set some convenient options to avoid error messages etc
- setlocal nomodifiable
- setlocal buftype=nowrite
- setlocal bufhidden=hide
- if s:NO_HIDE
- setlocal bufhidden=delete
- endif
-
- " bail if no documentation was found
- if getline(1) =~ "^no Python documentation found"
- redraw |
- \ echohl WarningMsg |
- \ echomsg "No Python documentation for " . a:pyargs |
- \ echohl None
- setlocal bufhidden=delete
- quit
- return
- endif
-
- if winheight(0) > line('$')
- exec "resize " . line('$')
- endif
-
- " key map to these functions for these buffers
- nnoremap <silent> <buffer> K :call <SID>:KeyPydocLoad(expand("<cWORD>"))<Cr>
-
- " some _very_ basic syntax highlighting
- syn match pydocTitle "^[A-Z]\+$"
- hi link pydocTitle Tag
-
-endfunc
View
1  vim/ftplugin/python/python_complete.vim
@@ -1 +0,0 @@
-setlocal completefunc=pythoncomplete#Complete
View
232 vim/ftplugin/python/python_fold.vim
@@ -1,232 +0,0 @@
-" Fold routines for python code, version 3.2
-" Source: http://www.vim.org/scripts/script.php?script_id=2527
-" Last Change: 2009 Feb 25
-" Author: Jurjen Bos
-" Bug fixes and helpful comments: Grissiom, David Froger, Andrew McNabb
-
-" Principles:
-" - a def/class starts a fold
-" a line with indent less than the previous def/class ends a fold
-" empty lines and comment lines are linked to the previous fold
-" comment lines outside a def/class are never folded
-" other lines outside a def/class are folded together as a group
-" for algorithm, see bottom of script
-
-" - optionally, you can get empty lines between folds, see (***)
-" - another option is to ignore non-python files see (**)
-" - you can also modify the def/class check,
-" allowing for multiline def and class definitions see (*)
-
-" Note for vim 7 users:
-" Vim 6 line numbers always take 8 columns, while vim 7 has a numberwidth variable
-" you can change the 8 below to &numberwidth if you have vim 7,
-" this is only really useful when you plan to use more than 8 columns (i.e. never)
-
-" Note for masochists trying to read this:
-" I wanted to keep the functions short, so I replaced occurences of
-" if condition
-" statement
-" by
-" if condition | statement
-" wherever I found that useful
-
-" (*)
-" class definitions are supposed to ontain a colon on the same line.
-" function definitions are *not* required to have a colon, to allow for multiline defs.
-" I you disagree, use instead of the pattern '^\s*\(class\s.*:\|def\s\)'
-" to enforce : for defs: '^\s*\(class\|def\)\s.*:'
-" you'll have to do this in two places.
-let s:defpat = '^\s*\(@\|class\s.*:\|def\s\)'
-
-" (**) Ignore non-python files
-" Commented out because some python files are not recognized by Vim
-"if &filetype != 'python'
-" finish
-"endif
-
-setlocal foldmethod=expr
-setlocal foldexpr=GetPythonFold(v:lnum)
-setlocal foldtext=PythonFoldText()
-
-function! PythonFoldText()
- let fs = v:foldstart
- while getline(fs) =~ '^\s*@' | let fs = nextnonblank(fs + 1)
- endwhile
- let line = getline(fs)
- let nnum = nextnonblank(fs + 1)
- let nextline = getline(nnum)
- "get the document string: next line is ''' or """
- if nextline =~ "^\\s\\+[\"']\\{3}\\s*$"
- let line = line . " " . matchstr(getline(nextnonblank(nnum + 1)), '^\s*\zs.*\ze$')
- "next line starts with qoutes, and has text
- elseif nextline =~ "^\\s\\+[\"']\\{1,3}"
- let line = line." ".matchstr(nextline, "^\\s\\+[\"']\\{1,3}\\zs.\\{-}\\ze['\"]\\{0,3}$")
- elseif nextline =~ '^\s\+pass\s*$'
- let line = line . ' pass'
- endif
- "compute the width of the visible part of the window (see Note above)
- "let w = winwidth(0) - &foldcolumn - (&number ? 8 : 0)
- let w = 80 + &foldcolumn + (&number ? 8 : 0)
- let size = 1 + v:foldend - v:foldstart
- "compute expansion string
- let spcs = '................'
- while strlen(spcs) < w | let spcs = spcs . spcs
- endwhile
- "expand tabs (mail me if you have tabstop>10)
- let onetab = strpart(' ', 0, &tabstop)
- let line = substitute(line, '\t', onetab, 'g')
- return strpart(line.spcs, 0, w-strlen(size)-9).'...'.size.' lines'
-endfunction
-
-function! GetBlockIndent(lnum)
- " Auxiliary function; determines the indent level of the surrounding def/class
- " "global" lines are level 0, first def &shiftwidth, and so on
- " scan backwards for class/def that is shallower or equal
- let ind = 100
- let p = a:lnum+1
- while indent(p) >= 0
- let p = p - 1
- " skip empty and comment lines
- if getline(p) =~ '^$\|^\s*#' | continue
- " zero-level regular line
- elseif indent(p) == 0 | return 0
- " skip deeper or equal lines
- elseif indent(p) >= ind || getline(p) =~ '^$\|^\s*#' | continue
- " indent is strictly less at this point: check for def/class
- elseif getline(p) =~ s:defpat && getline(p) !~ '^\s*@'
- " level is one more than this def/class
- return indent(p) + &shiftwidth
- endif
- " shallower line that is neither class nor def: continue search at new level
- let ind = indent(p)
- endwhile
- "beginning of file
- return 0
-endfunction
-
-" Clever debug code, use as: call PrintIfCount(n,"Line: ".a:lnum.", value: ".x)
-let s:counter=0
-function! PrintIfCount(n,t)
- "Print text the nth time this function is called
- let s:counter = s:counter+1
- if s:counter==a:n | echo a:t
- endif
-endfunction
-
-function! GetPythonFold(lnum)
- " Determine folding level in Python source (see "higher foldlevel theory" below)
- let line = getline(a:lnum)
- let ind = indent(a:lnum)
- " Case D***: class and def start a fold
- " If previous line is @, it is not the first
- if line =~ s:defpat && getline(prevnonblank(a:lnum-1)) !~ '^\s*@'
- " let's see if this range of 0 or more @'s end in a class/def
- let n = a:lnum
- while getline(n) =~ '^\s*@' | let n = nextnonblank(n + 1)
- endwhile
- " yes, we have a match: this is the first of a real def/class with decorators
- if getline(n) =~ s:defpat
- return ">".(ind/&shiftwidth+1)
- endif
- " Case E***: empty lines fold with previous
- " (***) change '=' to -1 if you want empty lines/comment out of a fold
- elseif line == '' | return '-1'
- endif
- " now we need the indent from previous
- let p = prevnonblank(a:lnum-1)
- while p>0 && getline(p) =~ '^\s*#' | let p = prevnonblank(p-1)
- endwhile
- let pind = indent(p)
- " If previous was definition: count as one level deeper
- if getline(p) =~ s:defpat && getline(prevnonblank(a:lnum - 1)) !~ '^\s*@'
- let pind = pind + &shiftwidth
- " if begin of file: take zero
- elseif p==0 | let pind = 0
- endif
- " Case S*=* and C*=*: indent equal
- if ind>0 && ind==pind | return '='
- " Case S*>* and C*>*: indent increase
- elseif ind>pind | return '='
- " All cases with 0 indent
- elseif ind==0
- " Case C*=0*: separate global code blocks
- if pind==0 && line =~ '^#' | return 0
- " Case S*<0* and S*=0*: global code
- elseif line !~'^#'
- " Case S*<0*: new global statement if/while/for/try/with
- if 0<pind && line!~'^else\s*:\|^except.*:\|^elif.*:\|^finally\s*:' | return '>1'
- " Case S*=0*, after level 0 comment
- elseif 0==pind && getline(prevnonblank(a:lnum-1)) =~ '^\s*#' | return '>1'
- " Case S*=0*, other, stay 1
- else | return '='
- endif
- endif
- " Case C*<0= and C*<0<: compute next indent
- let n = nextnonblank(a:lnum+1)
- while n>0 && getline(n) =~'^\s*#' | let n = nextnonblank(n+1)
- endwhile
- " Case C*<0=: split definitions
- if indent(n)==0 | return 0
- " Case C*<0<: shallow comment
- else | return -1
- end
- endif
- " now we really need to compute the actual fold indent
- " do the hard computation
- let blockindent = GetBlockIndent(a:lnum)
- " Case SG<* and CG<*: global code, level 1
- if blockindent==0 | return 1
- endif
- " now we need the indent from next
- let n = nextnonblank(a:lnum+1)
- while n>0 && getline(n) =~'^\s*#' | let n = nextnonblank(n+1)
- endwhile
- let nind = indent(n)
- " Case CR<= and CR<>
- "if line !~ '^\s*#' | call PrintIfCount(4,"Line: ".a:lnum.", blockindent: ".blockindent.", n: ".n.", nind: ".nind.", p: ".p.", pind: ".pind)
- endif
- if line =~ '^\s*#' && ind>=nind | return -1
- " Case CR<<: return next indent
- elseif line =~ '^\s*#' | return nind / &shiftwidth
- " Case SR<*: return actual indent
- else | return blockindent / &shiftwidth
- endif
-endfunction
-
-" higher foldlevel theory
-" There are five kinds of statements: S (code), D (def/class), E (empty), C (comment)
-
-" Note that a decorator statement (beginning with @) counts as definition,
-" but that of a sequence of @,@,@,def only the first one counts
-" This means that a definiion only counts if not preceded by a decorator
-
-" There are two kinds of folds: R (regular), G (global statements)
-
-" There are five indent situations with respect to the previous non-emtpy non-comment line:
-" > (indent), < (dedent), = (same); < and = combine with 0 (indent is zero)
-" Note: if the previous line is class/def, its indent is interpreted as one higher
-
-" There are three indent situations with respect to the next (non-E non-C) line:
-" > (dedent), < (indent), = (same)
-
-" Situations (in order of the script):
-" stat fold prev next
-" SDEC RG ><=00 ><=
-" D * * * begin fold level if previous is not @: '>'.ind/&sw+1
-" E * * * keep with previous: '='
-" S * = * stays the same: '='
-" C * = * combine with previous: '='
-" S * > * stays the same: '='
-" C * > * combine with previous: '='
-" C * =0 * separate blocks: 0
-" S * <0 * becomes new level 1: >1 (except except/else: 1)
-" S * =0 * stays 1: '=' (after level 0 comment: '>1')
-" C * <0 = split definitions: 0
-" C * <0 < shallow comment: -1
-" C * <0 > [never occurs]
-" S G < * global, not the first: 1
-" C G < * indent isn't 0: 1
-" C R < = foldlevel as computed for next line: -1
-" C R < > foldlevel as computed for next line: -1
-" S R < * compute foldlevel the hard way: use function
-" C R < < foldlevel as computed for this line: use function
View
10 vim/ftplugin/python/python_path.vim
@@ -1,10 +0,0 @@
-" Enable jumping to imports with gf
-
-python << EOF
-import os
-import sys
-import vim
-for p in sys.path:
- if os.path.isdir(p):
- vim.command(r"set path+=%s" % (p.replace(" ", r"\ ")))
-EOF
View
20 vim/ftplugin/python/python_settings.vim
@@ -1,20 +0,0 @@
-" Allow jumping to stdlib tags
-" Note: regenerate tags file with the following:
-" ctags -R -f ~/.vim/tags/python.ctags /usr/lib/pythonX.X
-set tags+=$HOME/.vim/tags/python.ctags
-
-" Show line number in gvim only
-if has('gui_running')
- set number
- set numberwidth=1
-endif
-
-setlocal expandtab
-setlocal shiftwidth=4
-setlocal tabstop=4
-setlocal softtabstop=4
-setlocal formatoptions+=croq
-
-let python_highlight_all=1
-let python_highlight_exceptions=1
-let python_highlight_builtins=1
View
105,468 vim/tags/python.ctags
0 additions, 105,468 deletions not shown
View
2  vim/tmp/.gitignore
@@ -1,2 +0,0 @@
-*~
-%*
View
315 vim/vimrc
@@ -1,315 +0,0 @@
-" .vimrc - main ViM settings file
-"
-" Randy Morris (rson451@gmail.com)
-"
-" CREATED: 2008-08-18 22:31
-" MODIFIED: 2011-03-23 17:31
-
-" Simple Settings {{{
-
-set nocompatible " Enable vim features
-set backup " Enable backup files
-set backupdir=~/.vim/tmp/ " Backup to a tmp dir
-
-" Allow backspace to remove indents, newlines and old text
-set backspace=indent,eol,start
-
-" Tab options
-set expandtab " Use spaces
-set tabstop=4
-set softtabstop=4
-set shiftwidth=4
-set smarttab " Indent using shiftwidth
-set autoindent " Copy indent from previous line
-
-" Display options
-set nowrap " Do not wrap lines by default
-set ruler " Always show cursor position
-set laststatus=2 " Always show the status line
-set novisualbell " Don't flash the screen
-set list " Show non-printing characters by default
-set listchars=tab:\ ,trail:·,extends:⋯,precedes:⋯,eol:
-set statusline=(%{strlen(&ft)?&ft:'?'},%{&fenc},%{&ff})\ \ %-9.(%l,%c%V%)\ \ %<%P
-
-" Show only spaces, not ugly bars
-set fillchars=
-
-" Matching characters
-set showmatch " Show matching brackets
-set matchpairs+=<:> " Make < and > match as well
-set matchtime=3 " Show matching brackets for only 0.3 seconds
-
-" Buffer options
-set autowrite " Automatically save before commands like :next and :make
-set hidden " Hide buffers when they are abandoned
-
-" Split options
-set splitright
-set nosplitbelow
-
-if v:version >= 700
- set numberwidth=1 " Keep line numbers small if it's shown
- set completeopt-=menu " Get rid of the ugly menu
-endif
-
-syntax on " Syntax highliting
-
-if has('folding')
- set foldenable " Enable code folding
- set foldmethod=marker " Fold on marker
- set foldmarker={{{,}}} " Keep foldmarkers default
- set foldopen-=search " Do not open folds when searching
- set foldopen-=undo " Do not open folds when undoing changes
- set foldlevel=999 " High default so folds are shown to start
- set foldcolumn=0 " Don't show a fold column
-endif
-
-if has('gui')
- set guioptions=
- set guifont=Monaco
-endif
-
-if has('persistent_undo')
- set undofile " Enable persistent undo
- set undodir=~/.vim/tmp/ " Store undofiles in a tmp dir
-endif
-
-" Open help in a vsplit rather than a split
-command! -nargs=? -complete=help Help :vertical help <args>
-cabbrev h h<C-\>esubstitute(getcmdline(), '^h\>', 'Help', '')<CR>
-
-if filereadable(expand('~/.vimrc_local'))
- execute 'source ' . expand('~/.vimrc_local')
-endif
-"}}}
-
-" Color Settings "{{{
-set background=dark
-
-" Set 256 color colorscheme if we can
-if $TERM =~ "256color" || has('gui_running')
- colorscheme xoria256-mod
-else
- colorscheme darkdot
-endif
-"}}}
-
-" Auto Commands "{{{
-if has('autocmd')
- " Set mutt settings
- autocmd BufRead,BufNewFile /tmp/mutt-* set ft=mail tw=72 spell wrap
-
- " Automatically add CREATED date and update MODIFIED date
- if v:version >= 700
- autocmd BufNewFile * call Created()
- autocmd BufWrite * call LastModified()
- endif
-
- " Explicitly set filetype on certain files
- autocmd BufRead,BufNewFile *.jinja set ft=htmljinja
-
- " Restore cursor position
- autocmd BufReadPost * call RestoreCursorPos()
- autocmd BufWinEnter * call OpenFoldOnRestore()
-endif
-"}}}
-
-" Key Maps "{{{
-" Change leader to something easier to reach
-let mapleader=','
-
-" Unmap annoying keys
-nnoremap q: <Nop>
-nnoremap q/ <Nop>
-nnoremap q? <Nop>
-
-" Alternate escape
-inoremap jj <Esc>
-cnoremap jj <Esc>
-
-" Select pasted text
-nnoremap gV `[v`]
-
-" Lazy pair expansion
-inoremap {<CR> {<CR>}<C-o>O<TAB>
-inoremap [<CR> [<CR>]<C-o>O<TAB>
-inoremap (<CR> (<CR>)<C-o>O<TAB>
-
-" Give me the option to quickly move in insert mode if need be.
-inoremap <C-a> <C-o>0
-inoremap <C-e> <C-o>$
-inoremap <C-b> <C-o>h
-inoremap <C-n> <C-o><C-n>
-inoremap <C-p> <C-o><C-p>
-inoremap <C-f> <C-o>l
-
-" Tmux integration
-nnoremap <silent> <C-w>h :call TmuxWindowMotion('h')<cr>
-nnoremap <silent> <C-w>j :call TmuxWindowMotion('j')<cr>
-nnoremap <silent> <C-w>k :call TmuxWindowMotion('k')<cr>
-nnoremap <silent> <C-w>l :call TmuxWindowMotion('l')<cr>
-
-" Comment conveniently
-vmap <Leader>c :call CommentLines()<CR>
-
-" Quickly save a file as root
-cabbrev w!! w !sudo tee % > /dev/null<CR>:e!<CR><CR>
-
-" Modify display
-nmap <Leader>L :setlocal invlist<CR>
-nmap <Leader>N :setlocal invnumber<CR>
-nmap <Leader>W :match todo /\%80v.\+/<CR>
-
-" Buffer Mappings
-if v:version >= 700
- for i in range(1,9,1)
- execute "silent! noremap <Leader>".i." :buffer! ".i."<CR>"
- execute "silent! noremap <Leader>s".i." :sbuffer! ".i."<CR>"
- execute "silent! noremap <Leader>v".i." :vertical sbuffer! ".i."<CR>"
- endfor
-endif
-"}}}
-
-" Mouse Settings "{{{
-if has('mouse')
- set mouse=a " Enable mouse usage (all modes) in terminals
- set ttymouse=xterm2 " Make mouse and putty work together
-
- map <M-Esc>[62~ <MouseDown>
- map! <M-Esc>[62~ <MouseDown>
- map <M-Esc>[63~ <MouseUp>
- map! <M-Esc>[63~ <MouseUp>
- map <M-Esc>[64~ <S-MouseDown>
- map! <M-Esc>[64~ <S-MouseDown>
- map <M-Esc>[65~ <S-MouseUp>
- map! <M-Esc>[65~ <S-MouseUp>
-endif
-"}}}
-
-" Functions "{{{
-" Auto update create date
-if v:version >= 700
- function! Created()
- normal msHmS
- let n = min([20, line("$")])
- execute '1,' . n . 's#^\(.\{,10}CREATED: \).*#\1' . strftime('%Y-%m-%d %H:%M') . '#e'
- normal `Szt`s
- call LastModified()
- endfunction
-
- " Auto update last modified date
- function! LastModified()
- if &modified
- normal msHmS
- let n = min([20, line("$")])
- execute '1,' . n . 's#^\(.\{,10}MODIFIED: \).*#\1' . strftime('%Y-%m-%d %H:%M') . '#e'
- normal `Szt`s
- endif
- endfunction
-endif
-
-" Restore cursor position
-function! RestoreCursorPos()
- if expand("<afile>:p:h") !=? $TEMP
- if line("'\"") > 1 && line("'\"") <= line("$")
- let line_num = line("'\"")
- let b:doopenfold = 1
- if (foldlevel(line_num) > foldlevel(line_num - 1))
- let line_num = line_num - 1
- let b:doopenfold = 2
- endif
- execute line_num
- endif
- endif
-endfunction
-
-" Open the fold if restoring cursor position
-function! OpenFoldOnRestore()
- if exists("b:doopenfold")
- execute "normal zv"
- if(b:doopenfold > 1)
- execute "+".1
- endif
- unlet b:doopenfold
- endif
-endfunction
-
-" Tmux integration
-function! TmuxWindowMotion(dir)
- let dir = a:dir
-
- let old_winnr = winnr()
- execute "wincmd " . dir
- if old_winnr != winnr()
- return
- endif
-
- if dir == 'h'
- let dir = '-L'
- elseif dir == 'j'
- let dir = '-D'
- elseif dir == 'k'
- let dir = '-U'
- elseif dir == 'l'
- let dir = '-R'
- endif
- call system('tmux select-pane ' . dir)
-endfunction
-
-"}}}
-
-" Plugin Specific {{{
-
-" Vim 7 and above {{{
-if v:version >= 700
- " Setup Vundle
- filetype off
- set runtimepath+=~/.vim/vundle/
- call vundle#rc()
-
- " Markdown syntax file
- Bundle "tpope/vim-markdown"
-
- " Ack
- Bundle "mileszs/ack.vim"
- cabbrev ack ack<C-\>esubstitute(getcmdline(), '^ack\>', 'Ack!', '')<CR>
-
- " NERD Commenter
- Bundle "scrooloose/nerdcommenter"
- let NERDCreateDefaultMappings = 0
- let NERDCommentWholeLinesInVMode = 1
- let NERDSpaceDelims = 1
- map <Leader>c <plug>NERDCommenterToggle
-
- " Super Tab
- Bundle "ervandew/supertab"
- let g:SuperTabDefaultCompletionType = "context"
- let g:SuperTabMidWordCompletion = 0
-
- " Bufstat
- Bundle "rson/vim-bufstat"
- highlight BufferNC ctermfg=248 ctermbg=239
- highlight link Buffer StatusLine
- let g:bufstat_active_hl_group = 'Buffer'
- let g:bufstat_inactive_hl_group = 'BufferNC'
- let g:bufstat_debug = 1
-endif
-" }}}
-
-" Vim 7.3 and above {{{
-if v:version >= 703
- " Gundo
- Bundle "sjl/gundo.vim"
- nmap <Leader>U :GundoToggle<CR>
- let g:gundo_preview_bottom = 1
- let g:gundo_preview_height = 10
- let g:gundo_width = 30
-endif
-"}}}
-
-"}}}
-
-" End Vundle
-filetype plugin indent on
-
-" vim:foldlevel=0:foldmethod=marker
1  vim/vundle
@@ -1 +0,0 @@
-Subproject commit f1bac10257387adfba940af21647171dd27f9c98
1  vimfiles
@@ -0,0 +1 @@
+Subproject commit 7f88a5937003988680cfc33f464a80bacf6ee26c
Please sign in to comment.
Something went wrong with that request. Please try again.