X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=ian-dotfiles.git;a=blobdiff_plain;f=dot%2Femacs;h=e696b6ac7de329ccbe8cc27829ca954abb9a40f8;hp=6bc26a42fc1988a9300d2d1e8a805946800389bb;hb=9cb420bd5326394c8a2f472b9c46ae964e113da9;hpb=301b097027d4f4a6ae99782bada75587db5d299b

diff --git a/dot/emacs b/dot/emacs
index 6bc26a4..e696b6a 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -1,5 +1,12 @@
 ; Ian Jackson's Emacs startup file - runs ~ian/emacs/ian.el
 ;
+
+;; Added by Package.el.  This must come before configurations of
+;; installed packages.  Don't delete this line.  If you don't want it,
+;; just comment it out by adding a semicolon to the start of the line.
+;; You may delete these explanatory comments.
+(package-initialize)
+
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
@@ -7,6 +14,7 @@
  ;; If there is more than one, they won't work right.
  '(blink-cursor-mode nil)
  '(font-use-system-font t)
+ '(inhibit-startup-screen t)
  '(send-mail-function (quote sendmail-send-it)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
@@ -14,8 +22,10 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  )
-
-(setq load-path (append '("~ian/emacs") load-path))
+(setq load-path (append '("~/emacs") load-path))
 (load-library "ian")
 (menu-bar-mode -1)
 (put 'dired-find-alternate-file 'disabled nil)
+(let ((ian-local (locate-library "ian-local")))
+  (if ian-local
+        (load-library ian-local)))