X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=dot%2Femacs;h=e05af6971371fdaf90854bd231325ded297828fb;hb=480b3dd41a23b8c46ea073e6be180e9fc7605972;hp=6bc26a42fc1988a9300d2d1e8a805946800389bb;hpb=4ed6df107b1db703ad86565447aa20b6385d3116;p=ian-dotfiles.git

diff --git a/dot/emacs b/dot/emacs
index 6bc26a4..e05af69 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -1,12 +1,21 @@
 ; 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.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(blink-cursor-mode nil)
+ '(display-buffer-reuse-frames t)
  '(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 +23,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)))