From cf9e2160505c1346ff15f6c9f71741c9b715e385 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 5 Oct 2013 11:50:26 +0100
Subject: Emacs: Switch back to auto-compile from auto-async-byte-compile

---
 emacs/init.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/emacs/init.el b/emacs/init.el
index 618e718..65f79fc 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -1053,9 +1053,9 @@ Also returns nil if pid is nil."
 
 ;;;; Programming
 
-(use-package auto-async-byte-compile
+(use-package auto-compile
   :ensure t
-  :init (add-hook 'emacs-lisp-mode-hook #'auto-async-byte-compile-mode))
+  :init (add-hook 'emacs-lisp-mode-hook #'auto-compile-on-save-mode))
 
 (use-package cc-mode
   :defer t
-- 
cgit 1.4.1


From 5390d0cd5e5f3fa7fc47c07e7889d9f5ccb6104b Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 5 Oct 2013 11:50:55 +0100
Subject: Emacs: Enable flx in ido

---
 emacs/init.el | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/emacs/init.el b/emacs/init.el
index 65f79fc..7866db6 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -567,6 +567,11 @@ Values: `desktop', `server', `laptop'")
               (ido-initiate-auto-merge (current-buffer)))
             (bind-key "C-c C-s" #'ido-manual-merge ido-file-dir-completion-map)))
 
+(use-package flx-ido
+  :ensure t
+  :init (progn
+          (flx-ido-mode 1)))
+
 (use-package smex
   :ensure t
   :bind (("M-x" . smex)
-- 
cgit 1.4.1


From 679f2843746576f48e4ffd106a21753346fc4bcb Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Sat, 5 Oct 2013 13:13:17 +0100
Subject: Emacs: disable ido-virtual-buffers due to issues with flx-ido

---
 emacs/init.el | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/emacs/init.el b/emacs/init.el
index 7866db6..af45349 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -558,8 +558,7 @@ Values: `desktop', `server', `laptop'")
   :config (progn
             (setq ido-decorations (quote ("\n›" "" "\n " "\n …" "[" "]" " [No match]" " [Matched]" " [Not readable]" " [Too big]" " [Confirm]"))
                   ido-auto-merge-delay-time 99999
-                  ido-enable-flex-matching t
-                  ido-use-virtual-buffers t)
+                  ido-enable-flex-matching t)
 
             (ido-init-completion-maps)
             (defun ido-manual-merge ()
-- 
cgit 1.4.1