Merge branch 'master' of github.com:abobov/dotfiles

Conflicts:
	.gitmodules

1 files changed, 0 insertions, 32 deletions

diff --git a/files/.vim/ftplugin/yaml.vim b/files/.vim/ftplugin/yaml.vim
deleted file mode 100755
index ca3abe2..0000000
--- a/files/.vim/ftplugin/yaml.vim
+++ /dev/null
@@ -1,32 +0,0 @@
-" Vim indent file

-" Language: Yaml

-" Author: Ian Young

-" Get it bundled for pathogen: https://github.com/avakhov/vim-yaml

-

-if exists("b:did_indent")

-  finish

-endif

-"runtime! indent/ruby.vim

-"unlet! b:did_indent

-let b:did_indent = 1

-

-setlocal autoindent sw=2 et

-setlocal indentexpr=GetYamlIndent()

-setlocal indentkeys=o,O,*<Return>,!^F

-

-function! GetYamlIndent()

-  let lnum = v:lnum - 1

-  if lnum == 0

-    return 0

-  endif

-  let line = substitute(getline(lnum),'\s\+$','','')

-  let indent = indent(lnum)

-  let increase = indent + &sw

-  if line =~ ':$'

-    return increase

-  else

-    return indent

-  endif

-endfunction

-

-" vim:set sw=2: