From b5d57e4a27c4f82be0923c8bbfa213f5216d0cb6 Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Fri, 6 Mar 2015 15:21:26 +0900
Subject: [PATCH] Fix make run-emacs

---
 Makefile |  4 ++--
 emacs.el | 37 +++++++++++++++++++++----------------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index a7957fd..84b306a 100644
--- a/Makefile
+++ b/Makefile
@@ -345,7 +345,7 @@ command_extract_setup_load := $(grep) -e 'SETUP_LOAD: ' | \
 		sed -e 's/^.*SETUP_LOAD: //' -e 's|DOTFILES_DIR|$(dotfiles_dir)|'
 
 $(home)/.emacs.d/init.el $(home)/.vimrc $(home)/.tmux.conf:
-	cat "$<" | $(command_extract_setup_load) | tee -a "$@"
+	test -f "$@" || cat "$<" | $(command_extract_setup_load) | tee -a "$@"
 
 
 
@@ -353,7 +353,7 @@ $(home)/.emacs.d/init.el $(home)/.vimrc $(home)/.tmux.conf:
 # ===
 
 run-emacs: $(home)/.emacs.d/init.el
-	$(emacs) -q --eval "(setq )" --load "$<"
+	$(emacs) -q --eval "(setq user-emacs-directory \"$(home)/.emacs.d/\")" --load "$<"
 
 
 
diff --git a/emacs.el b/emacs.el
index ea0bbbf..2a32b6d 100644
--- a/emacs.el
+++ b/emacs.el
@@ -30,6 +30,14 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Some macros for internals
 
+(defun call-after-init (func)
+  "If `after-init-hook' has been run, call FUNC immediately.
+Otherwize hook it."
+  (if after-init-time
+      (funcall func)
+    (add-hook 'after-init-hook
+              func)))
+
 (defmacro defvar-set (symbol value &optional docstring)
   "Define SYMBOL as a variable and set to VALUE.
 
@@ -276,12 +284,11 @@ IF OK-IF-ALREADY-EXISTS is true force download."
   (let ((kill-emacs-hook nil))
     (kill-emacs)))
 
-(add-hook 'after-init-hook
-          (lambda ()
-            (message "%s %s" invocation-name emacs-version)
-            (message "%s was taken to initialize emacs." (emacs-init-time))
-            (switch-to-buffer "*Messages*")
-            ))
+(call-after-init
+ (lambda ()
+   (message "%s %s" invocation-name emacs-version)
+   (message "%s was taken to initialize emacs." (emacs-init-time))
+   (switch-to-buffer "*Messages*")))
 
 (cd ".")  ; when using windows use / instead of \ in `default-directory'
 
@@ -302,9 +309,8 @@ IF OK-IF-ALREADY-EXISTS is true force download."
 ;; (comint-show-maximum-output)
 
 ;; kill scratch
-(add-hook 'after-init-hook
-          (lambda ()
-            (kill-buffer "*scratch*")))
+(call-after-init (lambda ()
+                         (kill-buffer "*scratch*")))
 
 ;; modifier keys
 ;; (setq mac-option-modifier 'control)
@@ -447,11 +453,10 @@ IF OK-IF-ALREADY-EXISTS is true force download."
 
 ;; http://www.geocities.jp/simizu_daisuke/bunkei-meadow.html#frame-title
 ;; display date
-(add-hook 'after-init-hook
-          (lambda ()
-            (when display-time-mode
-              (display-time-update))
-            ))
+(call-after-init (lambda ()
+                   (when display-time-mode
+                     (display-time-update))
+                   ))
 
 (when (safe-require-or-eval 'time)
   (setq display-time-interval 29)
@@ -824,7 +829,7 @@ IF OK-IF-ALREADY-EXISTS is true force download."
   ;; Load scim-bridge.
   (when (safe-require-or-eval 'scim-bridge)
     ;; Turn on scim-mode automatically after loading .emacs
-    (add-hook 'after-init-hook 'scim-mode-on)
+    (call-after-init 'scim-mode-on)
     (defvar-set scim-cursor-color "red")
     (scim-define-preedit-key ?\^h t)
     (scim-define-common-key ?\* nil)
@@ -915,7 +920,7 @@ IF OK-IF-ALREADY-EXISTS is true force download."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; https://github.com/lunaryorn/flycheck
 (when (safe-require-or-eval 'flycheck)
-  (add-hook 'after-init-hook 'global-flycheck-mode))
+  (call-after-init 'global-flycheck-mode))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; window