disabled indent in vimrc, moved custom rules to plugins (since they a…

…re enabled), changed coffeescript indenting to spaces and added .netrwhist to .gitignore
w33ble · Feb 2, 2012 · f7e3169 · f7e3169
1 parent 2441516
commit f7e3169
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 .git
 *.swp
+.netrwhist
diff --git a/bundle/custom/indent/coffee.vim → bundle/custom/plugin/coffee.vim b/bundle/custom/indent/coffee.vim → bundle/custom/plugin/coffee.vim
@@ -1,5 +1,5 @@
 " modify the indenting
-"set expandtab      " insert spaces instead of tabs
+set expandtab      " insert spaces instead of tabs
 set tabstop=2       " use X spaces when tab is pressed
 set shiftwidth=2    " shifttabs are also X spaces
 set smarttab        " make delete remove X spaces

diff --git a/bundle/custom/indent/javascript.vim → bundle/custom/plugin/javascript.vim b/bundle/custom/indent/javascript.vim → bundle/custom/plugin/javascript.vim
diff --git a/bundle/custom/indent/php.vim → bundle/custom/plugin/php.vim b/bundle/custom/indent/php.vim → bundle/custom/plugin/php.vim
diff --git a/vimrc b/vimrc
@@ -113,4 +113,4 @@ au FileType * setlocal comments=
 " Pathogen
 call pathogen#infect() 
 " enable plugins
-filetype plugin indent on
+filetype plugin on