From ff6e43d0962a903b33a5aa266cb3f79cf37a1868 Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami.samhuri@gmail.com>
Date: Sun, 31 Jan 2010 18:07:50 -0800
Subject: [PATCH 1/4] enabled yaml mode

---
 emacs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emacs b/emacs
index df68c9a..05c78fe 100644
--- a/emacs
+++ b/emacs
@@ -197,8 +197,8 @@
 ;; (require 'textile-mode)
 ;; (add-to-list 'auto-mode-alist '("\\.textile\\'" . textile-mode))
 
-;; (require 'yaml-mode)
-;; (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
+(require 'yaml-mode)
+(add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
 
 
 ;; keep a list of recently visited files

From 0baa256cba92573695c8f4a2cd7e8f4cb1177fbe Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami.samhuri@gmail.com>
Date: Sun, 31 Jan 2010 18:08:05 -0800
Subject: [PATCH 2/4] highlight the current line

---
 emacs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/emacs b/emacs
index 05c78fe..928566c 100644
--- a/emacs
+++ b/emacs
@@ -258,6 +258,11 @@
 ;;   (set-face-background 'flymake-errline "red4")
 ;;   (set-face-background 'flymake-warnline "dark slate blue"))
 
+;; highlight the current line
+(global-hl-line-mode 1)
+ 
+;; To customize the background color
+(set-face-background 'hl-line "#223")
 
 ;;;;;;;;;;;;;;;;;;
 ;; key bindings ;;

From 787930a3049da179408938672e9b0c5e41144bc5 Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami.samhuri@gmail.com>
Date: Wed, 10 Feb 2010 21:30:54 -0800
Subject: [PATCH 3/4] remove useless "&& true" from OS checks

---
 zsh/zshrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zsh/zshrc b/zsh/zshrc
index 2b3bf61..1652d81 100755
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -9,8 +9,8 @@ export LANG="en_CA.UTF-8"
 
 cdpath=(~)
 
-function linux() { [[ `uname -s` = "Linux"  ]] && true }
-function mac()   { [[ `uname -s` = "Darwin" ]] && true }
+function linux() { [[ `uname -s` = "Linux"  ]] }
+function mac()   { [[ `uname -s` = "Darwin" ]] }
 
 HOSTNAME=`hostname -s`
 KEYCHAIN_HOST=`hostname`

From 5fe53233558bfe6a239113937c02c716c91537ec Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami.samhuri@gmail.com>
Date: Wed, 10 Feb 2010 21:31:45 -0800
Subject: [PATCH 4/4] change line highlight colour

---
 emacs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emacs b/emacs
index 270e845..cd476ba 100644
--- a/emacs
+++ b/emacs
@@ -266,7 +266,7 @@
 (global-hl-line-mode 1)
  
 ;; To customize the background color
-(set-face-background 'hl-line "#223")
+(set-face-background 'hl-line "#330")
 
 ;;;;;;;;;;;;;;;;;;
 ;; key bindings ;;