From 86b571576d6c54ea6be0a960dc6f8e27347d568e Mon Sep 17 00:00:00 2001 From: Colin McCabe Date: Mon, 15 Feb 2010 13:30:35 -0800 Subject: [PATCH] Add vim configuration files to the repo --- .vim/ftdetect/cpm.vim | 1 + .vim/ftdetect/make.vim | 1 + .vim/ftdetect/ocaml.vim | 1 + .vim/ftdetect/tex.vim | 1 + .vim/indent/c.vim | 16 +++ .vim/indent/cpm.vim | 22 ++++ .vim/indent/java.vim | 13 +++ .vim/indent/make.vim | 11 ++ .vim/indent/ocaml.vim | 253 +++++++++++++++++++++++++++++++++++++++++++++++ .vimrc | 52 ++++++++++ 10 files changed, 371 insertions(+), 0 deletions(-) create mode 100644 .vim/ftdetect/cpm.vim create mode 100644 .vim/ftdetect/make.vim create mode 100644 .vim/ftdetect/ocaml.vim create mode 100644 .vim/ftdetect/tex.vim create mode 100644 .vim/indent/c.vim create mode 100644 .vim/indent/cpm.vim create mode 100644 .vim/indent/java.vim create mode 100644 .vim/indent/make.vim create mode 100644 .vim/indent/ocaml.vim create mode 100644 .vimrc diff --git a/.vim/ftdetect/cpm.vim b/.vim/ftdetect/cpm.vim new file mode 100644 index 0000000..7ff2e55 --- /dev/null +++ b/.vim/ftdetect/cpm.vim @@ -0,0 +1 @@ +au BufNewFile,BufRead *.cpm set filetype=cpm diff --git a/.vim/ftdetect/make.vim b/.vim/ftdetect/make.vim new file mode 100644 index 0000000..58bd816 --- /dev/null +++ b/.vim/ftdetect/make.vim @@ -0,0 +1 @@ +au! BufNewFile,BufRead *Makefile*,OMakeroot set ft=make diff --git a/.vim/ftdetect/ocaml.vim b/.vim/ftdetect/ocaml.vim new file mode 100644 index 0000000..7107a9e --- /dev/null +++ b/.vim/ftdetect/ocaml.vim @@ -0,0 +1 @@ +au BufRead,BufNewFile *.ml,*.mli,*.mll,*.mly,.ocamlinit set ft=ocaml diff --git a/.vim/ftdetect/tex.vim b/.vim/ftdetect/tex.vim new file mode 100644 index 0000000..17ee1b8 --- /dev/null +++ b/.vim/ftdetect/tex.vim @@ -0,0 +1 @@ +au! BufNewFile,BufRead *.hva set ft=tex diff --git a/.vim/indent/c.vim b/.vim/indent/c.vim new file mode 100644 index 0000000..b0477b0 --- /dev/null +++ b/.vim/indent/c.vim @@ -0,0 +1,16 @@ +if exists("b:did_indent") + finish +endif + +source $VIMRUNTIME/indent/c.vim +let b:did_indent = 1 + +" Linux kernel style indentation +set sw=8 +set ts=8 +set noet + +" 80 column limit +set tw=80 + +set cinoptions+=g2h2:2=2t0(0 diff --git a/.vim/indent/cpm.vim b/.vim/indent/cpm.vim new file mode 100644 index 0000000..b5f2367 --- /dev/null +++ b/.vim/indent/cpm.vim @@ -0,0 +1,22 @@ +if exists("b:did_indent") + finish +endif + +let b:did_indent = 1 + +" Unlimited line length +set tw=0 + +" Activate spelling checker +:setlocal spell spelllang=en_us +:highlight clear SpellBad +:highlight SpellBad term=standout ctermfg=1 term=underline cterm=underline +:highlight clear SpellCap +:highlight SpellCap term=underline cterm=underline +:highlight clear SpellRare +:highlight SpellRare term=underline cterm=underline +:highlight clear SpellLocal +:highlight SpellLocal term=underline cterm=underline + +" To turn off spelling highlighting: +"set spellang= diff --git a/.vim/indent/java.vim b/.vim/indent/java.vim new file mode 100644 index 0000000..e975164 --- /dev/null +++ b/.vim/indent/java.vim @@ -0,0 +1,13 @@ +if exists("b:did_indent") + finish +endif + +source $VIMRUNTIME/indent/java.vim +let b:did_indent = 1 + +set sw=4 +set ts=4 +set et + +" Unfortunately, Java needs a generous line length limit +set tw=100 diff --git a/.vim/indent/make.vim b/.vim/indent/make.vim new file mode 100644 index 0000000..fa69079 --- /dev/null +++ b/.vim/indent/make.vim @@ -0,0 +1,11 @@ +if exists("b:did_indent") + finish +endif + +source $VIMRUNTIME/indent/make.vim +let b:did_indent = 1 + +" never expand tabs for Makefiles +set noet +set sw=8 +set ts=8 diff --git a/.vim/indent/ocaml.vim b/.vim/indent/ocaml.vim new file mode 100644 index 0000000..5c267af --- /dev/null +++ b/.vim/indent/ocaml.vim @@ -0,0 +1,253 @@ +" Vim indent file +" Language: OCaml +" Maintainers: Jean-Francois Yuen +" Mike Leary +" Markus Mottl +" URL: http://www.ocaml.info/vim/indent/ocaml.vim +" Last Change: 2005 Jun 25 - Fixed multiple bugs due to 'else\nreturn ind' working +" 2005 May 09 - Added an option to not indent OCaml-indents specially (MM) +" 2005 Apr 11 - Fixed an indentation bug concerning "let" (MM) + +" Only load this indent file when no other was loaded. +if exists("b:did_indent") + finish +endif +let b:did_indent = 1 + +setlocal expandtab +setlocal indentexpr=GetOCamlIndent() +setlocal indentkeys+=0=and,0=class,0=constraint,0=done,0=else,0=end,0=exception,0=external,0=if,0=in,0=include,0=inherit,0=initializer,0=let,0=method,0=open,0=then,0=type,0=val,0=with,0;;,0>\],0\|\],0>},0\|,0},0\],0) +setlocal nolisp +setlocal nosmartindent +setlocal textwidth=80 + +" Comment formatting +if !exists("no_ocaml_comments") + if (has("comments")) + setlocal comments=sr:(*,mb:*,ex:*) + setlocal fo=cqort + endif +endif + +" Only define the function once. +if exists("*GetOCamlIndent") + finish +endif + +" Define some patterns: +let s:beflet = '^\s*\(initializer\|method\|try\)\|\(\<\(begin\|do\|else\|in\|then\|try\)\|->\|<-\|=\|;\|(\)\s*$' +let s:letpat = '^\s*\(let\|type\|module\|class\|open\|exception\|val\|include\|external\)\>' +let s:letlim = '\(\<\(sig\|struct\)\|;;\)\s*$' +let s:lim = '^\s*\(exception\|external\|include\|let\|module\|open\|type\|val\)\>' +let s:module = '\<\%(begin\|sig\|struct\|object\)\>' +let s:obj = '^\s*\(constraint\|inherit\|initializer\|method\|val\)\>\|\<\(object\|object\s*(.*)\)\s*$' +let s:type = '^\s*\%(class\|let\|type\)\>.*=' + +" Skipping pattern, for comments +function s:GetLineWithoutFullComment(lnum) + let lnum = prevnonblank(a:lnum - 1) + let lline = substitute(getline(lnum), '(\*.*\*)\s*$', '', '') + while lline =~ '^\s*$' && lnum > 0 + let lnum = prevnonblank(lnum - 1) + let lline = substitute(getline(lnum), '(\*.*\*)\s*$', '', '') + endwhile + return lnum +endfunction + +" Indent for ';;' to match multiple 'let' +function s:GetInd(lnum, pat, lim) + let llet = search(a:pat, 'bW') + let old = indent(a:lnum) + while llet > 0 + let old = indent(llet) + let nb = s:GetLineWithoutFullComment(llet) + if getline(nb) =~ a:lim + return old + endif + let llet = search(a:pat, 'bW') + endwhile + return old +endfunction + +" Indent pairs +function s:FindPair(pstart, pmid, pend) + call search(a:pend, 'bW') + return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"')) +endfunction + +" Indent 'let' +function s:FindLet(pstart, pmid, pend) + call search(a:pend, 'bW') + return indent(searchpair(a:pstart, a:pmid, a:pend, 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment" || getline(".") =~ "^\\s*let\\>.*=.*\\\s*$' + return ind + &sw + &sw + endif + + let line = getline(v:lnum) + + " Indent if current line begins with 'end': + if line =~ '^\s*end\>' + return s:FindPair(s:module, '','\') + + " Indent if current line begins with 'done' for 'do': + elseif line =~ '^\s*done\>' + return s:FindPair('\', '','\') + + " Indent if current line begins with '}' or '>}': + elseif line =~ '^\s*\(\|>\)}' + return s:FindPair('{', '','}') + + " Indent if current line begins with ']', '|]' or '>]': + elseif line =~ '^\s*\(\||\|>\)\]' + return s:FindPair('\[', '','\]') + + " Indent if current line begins with ')': + elseif line =~ '^\s*)' + return s:FindPair('(', '',')') + + " Indent if current line begins with 'let': + elseif line =~ '^\s*let\>' + if lline !~ s:lim . '\|' . s:letlim . '\|' . s:beflet + return s:FindLet(s:type, '','\' + if lline !~ s:lim . '\|\\)\|\<\(function\|parser\|private\|with\)\s*$' + call search('|', 'bW') + return indent(searchpair('^\s*\(match\|type\)\>\|\<\(function\|parser\|private\|with\)\s*$', '', '^\s*|', 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment" || getline(".") !~ "^\\s*|.*->"')) + endif + + " Indent if current line begins with ';;': + elseif line =~ '^\s*;;' + if lline !~ ';;\s*$' + return s:GetInd(v:lnum, s:letpat, s:letlim) + endif + + " Indent if current line begins with 'in': + elseif line =~ '^\s*in\>' + if lline !~ '^\s*\(let\|and\)\>' + return s:FindPair('\', '', '\') + endif + + " Indent if current line begins with 'else': + elseif line =~ '^\s*else\>' + if lline !~ '^\s*\(if\|then\)\>' + return s:FindPair('\', '', '\') + endif + + " Indent if current line begins with 'then': + elseif line =~ '^\s*then\>' + if lline !~ '^\s*\(if\|else\)\>' + return s:FindPair('\', '', '\') + endif + + " Indent if current line begins with 'and': + elseif line =~ '^\s*and\>' + if lline !~ '^\s*\(and\|let\|type\)\>\|\' + if lline !~ '^\s*\(match\|try\)\>' + return s:FindPair('\<\%(match\|try\)\>', '','\') + endif + + " Indent if current line begins with 'exception', 'external', 'include' or + " 'open': + elseif line =~ '^\s*\(exception\|external\|include\|open\)\>' + if lline !~ s:lim . '\|' . s:letlim + call search(line) + return indent(search('^\s*\(\(exception\|external\|include\|open\|type\)\>\|val\>.*:\)', 'bW')) + endif + + " Indent if current line begins with 'val': + elseif line =~ '^\s*val\>' + if lline !~ '^\s*\(exception\|external\|include\|open\)\>\|' . s:obj . '\|' . s:letlim + return indent(search('^\s*\(\(exception\|include\|initializer\|method\|open\|type\|val\)\>\|external\>.*:\)', 'bW')) + endif + + " Indent if current line begins with 'constraint', 'inherit', 'initializer' + " or 'method': + elseif line =~ '^\s*\(constraint\|inherit\|initializer\|method\)\>' + if lline !~ s:obj + return indent(search('\<\(object\|object\s*(.*)\)\s*$', 'bW')) + &sw + endif + + endif + + " Add a 'shiftwidth' after lines ending with: + if lline =~ '\(:\|=\|->\|<-\|(\|\[\|{\|{<\|\[|\|\[<\|\<\(begin\|do\|else\|fun\|function\|functor\|if\|initializer\|object\|parser\|private\|sig\|struct\|then\|try\)\|\') + + " Back to normal indent after lines ending with 'in': + elseif lline =~ '\' + let ind = s:FindPair('\', '', '\') + + " Back to normal indent after lines ending with 'done': + elseif lline =~ '\', '','\') + + " Back to normal indent after lines ending with '}' or '>}': + elseif lline =~ '\(\|>\)}\s*$' + let ind = s:FindPair('{', '','}') + + " Back to normal indent after lines ending with ']', '|]' or '>]': + elseif lline =~ '\(\||\|>\)\]\s*$' + let ind = s:FindPair('\[', '','\]') + + " Back to normal indent after comments: + elseif lline =~ '\*)\s*$' + call search('\*)', 'bW') + let ind = indent(searchpair('(\*', '', '\*)', 'bWn', 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string"')) + + " Back to normal indent after lines ending with ')': + elseif lline =~ ')\s*$' + let ind = s:FindPair('(', '',')') + + " If this is a multiline comment then align '*': + elseif lline =~ '^\s*(\*' && line =~ '^\s*\*' + let ind = ind + 1 + + endif + + " Subtract a 'shiftwidth' after lines matching 'match ... with parser': + if lline =~ '\.*\\s*\ + +"*************** gui stuff *************** +set guifont=fixed +set guioptions-=T +set laststatus=2 +"noremap  + +"*************** colin's auto-commenter *************** +map ,/ :s/^/\/\//:nohlsearch +map ,,/ :s/\/\///:nohlsearch +map ,# :s/^/#/:nohlsearch +map ,,# :s/#//:nohlsearch -- 1.6.6.rc1.39.g9a42