# HG changeset patch # User Augie Fackler # Date 1239301639 18000 # Node ID fd369b708cbe0ff1eca2f11aabdb15b7d7e7a544 # Parent b84c4cac31488ea28fd09a3ce37f819c87c2bda6 Better way of altering load-path, add support for local-to-machine emacs configs. diff --git a/.emacs b/.emacs --- a/.emacs +++ b/.emacs @@ -3,7 +3,7 @@ ; Karl Fogel: http://svn.red-bean.com/repos/kfogel/trunk ; Dave Anderson: -(setq load-path (cons (expand-file-name "~/.elisp") load-path)) +(add-to-list 'load-path (expand-file-name "~/.elisp")) ; Better buffer switching and file loading (load first in case we need the ; * Messages * buffer) (require 'ido) @@ -134,3 +134,7 @@ point." (global-set-key [(meta z)] 'textmate-find-in-project-type) (global-set-key [(meta m)] 'iconify-or-deiconify-frame) (global-set-key [(control backspace)] 'kill-word) + + +(if (file-regular-p (expand-file-name (concat (getenv "HOME") "/.emacs-machine.el"))) + (load (expand-file-name "~/.emacs-machine.el")))