From fe373356beb70ecc37b7071dbff9ab921486bb51 Mon Sep 17 00:00:00 2001
From: Chris Coley <chris@codingallnight.com>
Date: Mon, 8 Dec 2014 13:19:17 -0800
Subject: [PATCH] bashrc should allow local by default. Also setting tabstop to
match softtabstop in vimrc
---
bashrc | 6 +++---
vimrc | 8 +++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/bashrc b/bashrc
index 32ef097..7718f3d 100644
--- a/bashrc
+++ b/bashrc
@@ -95,9 +95,9 @@ fi
#fi
# Enable local bashrc files to overwrite this file
-#if [ -f ~/.bashrc.local ]; then
-# . ~/.bashrc.local
-#fi
+if [ -f ~/.bashrc.local ]; then
+ . ~/.bashrc.local
+fi
# Enable Git auto completion
if [ -f ~/git-completion.bash ]; then
diff --git a/vimrc b/vimrc
index e462d76..ed7004c 100644
--- a/vimrc
+++ b/vimrc
@@ -19,7 +19,8 @@ set formatoptions+=ro " Automatically insert the comment character when you
" Tab options
set expandtab " Soft tabs, changes tabs to spaces
-set softtabstop=4 " Number of spaces in a tab
+set tabstop=4 " Number of spaces in a tab
+set softtabstop=4 " Number of spaces in a soft tab
set shiftwidth=4 " Number of spaces in an indentation level.
@@ -56,6 +57,7 @@ autocmd BufEnter * let &titlestring = expand("%:t") . " - %{$USER}@" . hostname(
" Filetype specific indentation
-filetype plugin indent on
-autocmd FileType html setlocal shiftwidth=2 softtabstop=2 " HTML
+"filetype plugin indent on
+"autocmd FileType html setlocal shiftwidth=2 softtabstop=2 " HTML
+"autocmd FileType php setlocal shiftwidth=4 softtabstop=4 " PHP
--
GitLab