about summary refs log tree commit diff
path: root/emacs.d
diff options
context:
space:
mode:
Diffstat (limited to 'emacs.d')
-rw-r--r--emacs.d/init.el4
1 files changed, 3 insertions, 1 deletions
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")