From 81be8917642803d657c24c6fa9440fe5ecfec5ff Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Wed, 12 Mar 2014 23:11:48 +0100
Subject: Fix usage on laptop

---
 .emacs.d/init.el               | 42 +++++++++++++++++-------------------------
 .emacs.d/site-lisp/drd.el      |  8 ++++++++
 .emacs.d/site-lisp/org-init.el |  2 +-
 3 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 .emacs.d/site-lisp/drd.el

(limited to '.emacs.d')

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 31f2fd7..587b023 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -688,22 +688,21 @@ For `python-mode' I prefer `python-imenu-create-flat-index'."
                            (hide-entry))
                        (call-interactively func))))))
 
-(let ((theme (if (equal system-name "drd") 'yoshi 'leuven)))
-  (let (setp)
-    (defun oni:set-theme (frame)
-      "Try to set the theme for the current (first) frame."
-      (ignore frame)
-      (unless setp
-        (load-theme theme t)
-        (smt/enable)
-        (require 'my-smt)
-        (smt/set-theme 'my-smt)
-        (set-face-attribute 'mode-line nil :box nil)
-        (set-face-attribute 'mode-line-inactive nil :box nil))))
-
-  (if (daemonp)
-      (add-hook 'after-make-frame-functions #'oni:set-theme)
-    (oni:eval-after-init (oni:set-theme nil))))
+(let (setp)
+  (defun oni:set-theme (frame)
+    "Try to set the theme for the current (first) frame."
+    (ignore frame)
+    (unless setp
+      (load-theme 'yoshi t)
+      (smt/enable)
+      (require 'my-smt)
+      (smt/set-theme 'my-smt)
+      (set-face-attribute 'mode-line nil :box nil)
+      (set-face-attribute 'mode-line-inactive nil :box nil))))
+
+(if (daemonp)
+    (add-hook 'after-make-frame-functions #'oni:set-theme)
+  (oni:eval-after-init (oni:set-theme nil)))
 
 (defun oni:shell-command-with-command (command &optional output-buffer)
   "Print both COMMAND and the output into OUTPUT-BUFFER."
@@ -1418,15 +1417,6 @@ If no direction is given, don't split."
 (when (equal system-name "drd")
   (load "eap-autoloads"))
 
-(let ((quicklisp-slime-directory
-       "~/.local/share/quicklisp/local-projects/slime/"))
-  (add-to-list 'load-path quicklisp-slime-directory)
-  (require 'slime-autoloads)
-  (setq slime-backend (expand-file-name "swank-loader.lisp"
-                                        quicklisp-slime-directory)
-        slime-path quicklisp-slime-directory)
-  (slime-setup '(slime-fancy)))
-
 (auto-insert-mode)
 (electric-indent-mode -1)
 (ido-mode 1)
@@ -1438,6 +1428,8 @@ If no direction is given, don't split."
 (help-at-pt-set-timer)
 (windmove-default-keybindings)
 
+(load system-name :noerror)
+
 ;;;; Custom
 ;; Finally, load any `customize' settings.
 (load custom-file)
diff --git a/.emacs.d/site-lisp/drd.el b/.emacs.d/site-lisp/drd.el
new file mode 100644
index 0000000..6639232
--- /dev/null
+++ b/.emacs.d/site-lisp/drd.el
@@ -0,0 +1,8 @@
+(let ((quicklisp-slime-directory
+       "~/.local/share/quicklisp/local-projects/slime/"))
+  (add-to-list 'load-path quicklisp-slime-directory)
+  (require 'slime-autoloads)
+  (setq slime-backend (expand-file-name "swank-loader.lisp"
+                                        quicklisp-slime-directory)
+        slime-path quicklisp-slime-directory)
+  (slime-setup '(slime-fancy)))
diff --git a/.emacs.d/site-lisp/org-init.el b/.emacs.d/site-lisp/org-init.el
index 3612558..01213f2 100644
--- a/.emacs.d/site-lisp/org-init.el
+++ b/.emacs.d/site-lisp/org-init.el
@@ -29,7 +29,7 @@
 (require 'org-protocol)
 
 (eval-after-load "org"
-  '(require 'org-contacts))
+  '(require 'org-contacts nil :noerror))
 
 (eval-when-compile
   (require 'desktop)
-- 
cgit v1.2.3-54-g00ecf