Merge branch 'master' of github.com:samsonjs/config

This commit is contained in:
Sami Samhuri 2010-02-11 09:15:05 -08:00
commit d4b190d952
2 changed files with 9 additions and 4 deletions

9
emacs
View file

@ -201,8 +201,8 @@
;; (require 'textile-mode) ;; (require 'textile-mode)
;; (add-to-list 'auto-mode-alist '("\\.textile\\'" . textile-mode)) ;; (add-to-list 'auto-mode-alist '("\\.textile\\'" . textile-mode))
;; (require 'yaml-mode) (require 'yaml-mode)
;; (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode)) (add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
;; keep a list of recently visited files ;; keep a list of recently visited files
@ -262,6 +262,11 @@
;; (set-face-background 'flymake-errline "red4") ;; (set-face-background 'flymake-errline "red4")
;; (set-face-background 'flymake-warnline "dark slate blue")) ;; (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 "#330")
;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;
;; key bindings ;; ;; key bindings ;;

View file

@ -9,8 +9,8 @@ export LANG="en_CA.UTF-8"
cdpath=(~) cdpath=(~)
function linux() { [[ `uname -s` = "Linux" ]] && true } function linux() { [[ `uname -s` = "Linux" ]] }
function mac() { [[ `uname -s` = "Darwin" ]] && true } function mac() { [[ `uname -s` = "Darwin" ]] }
HOSTNAME=`hostname -s` HOSTNAME=`hostname -s`
KEYCHAIN_HOST=`hostname` KEYCHAIN_HOST=`hostname`