From 2f8813385805b7091b3a5c95a30a2985046424d1 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <vincent@spotify.com>
Date: Thu, 25 Jul 2013 20:22:57 +0200
Subject: emacs: Added init-local.el loading for machine-local configuration,
 removed jabber (using bitlbee instead)

---
 emacs.d/init.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'emacs.d')

diff --git a/emacs.d/init.el b/emacs.d/init.el
index 919a7bb63cea..3710b6380b69 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -31,7 +31,6 @@
                   geiser
                   quack
 		  rainbow-mode
-		  jabber
 		  )
 
   "A list of packages to install at launch.")
@@ -64,6 +63,9 @@
 (load "~/.emacs.d/init-bindings.el")
 (load "~/.emacs.d/init-eshell.el")
 
+;; A file with machine specific settings
+(load "~/.emacs.d/init-local.el")
+
 ;; IRC configuration (erc)
 ;; Actual servers and such are loaded from irc.el
 (load "~/.emacs.d/irc")
-- 
cgit 1.4.1