From cb812e671e45bea0c33a7361f1bd7262f020c46c Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 7 Oct 2013 13:10:18 +0100
Subject: Emacs: remove customisation of byte-compile-dest-file for init.el

Instead, rely on installer creating a symlink to ~/projects/dotfiles/init.elc
---
 emacs/elisp/ap-functions.el | 11 -----------
 emacs/init.el               |  7 +------
 install                     |  2 +-
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/emacs/elisp/ap-functions.el b/emacs/elisp/ap-functions.el
index 4c300015..19f63320 100644
--- a/emacs/elisp/ap-functions.el
+++ b/emacs/elisp/ap-functions.el
@@ -25,17 +25,6 @@
     (error (message "Invalid expression")
            (insert (current-kill 0)))))
 
-;;;###autoload
-(defun ap/byte-compile-get-dest (filename)
-  (let ((basename (file-name-nondirectory filename))
-        (dirname  (file-name-directory    filename)))
-    (cond
-     ((string-equal basename "init.el")
-      (if (file-exists-p (concat user-emacs-directory "init.el"))
-          (concat user-emacs-directory "init.elc")))
-     (t (let (byte-compile-dest-file-function)
-          (byte-compile-dest-file filename))))))
-
 ;;;###autoload
 (defun shell-execute (to-current-buffer)
   (interactive "P")
diff --git a/emacs/init.el b/emacs/init.el
index fd54684b..76a6ac90 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -877,8 +877,7 @@ Also returns nil if pid is nil."
          ("M-Z" . zap-to-char)))
 
 (use-package ap-functions
-  :commands (ap/remove-extra-cr
-             ap/byte-compile-get-dest)
+  :commands (ap/remove-extra-cr)
   :bind (("C-x r M-w" . copy-rectangle)
          ("M-!" . shell-execute)))
 
@@ -984,10 +983,6 @@ Also returns nil if pid is nil."
 (add-hook 'lisp-mode-hook #'ap/lisp-setup)
 (add-hook 'lisp-mode-hook #'set-common-lisp-indentation)
 
-(use-package bytecomp
-  :defer t
-  :config (setq byte-compile-dest-file-function #'ap/byte-compile-get-dest))
-
 (use-package elisp-slime-nav
   :commands elisp-slime-nav-mode
   :diminish elisp-slime-nav-mode)
diff --git a/install b/install
index b3dd84a3..13ee6cca 100755
--- a/install
+++ b/install
@@ -21,7 +21,7 @@ install-dot () {
 }
 
 install-dot $target/.git/hooks/ $target/git-hooks/*
-install-dot .emacs.d/ $target/emacs/*
+install-dot .emacs.d/ $target/emacs/{init.el{,c},elisp}
 install-dot . $target/^install(.) $target/zsh/zshrc $target/zsh/fasdrc
 install-dot .ssh/ $target/ssh/*
 if [[ -d projects/dwm ]]
-- 
cgit 1.4.1