From f7b470763a0f1ccf9a441531e64f1807a82f9df3 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 18 Sep 2017 18:56:14 +0200
Subject: Emacs: Fix beancount loading

If another repository exists whose name includes beancount and sorts
before it, then loading beancount.el will fail due to incorrect load path
---
 emacs/.emacs.d/main.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'emacs')

diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index 1aa78a4..aee8450 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -1785,7 +1785,7 @@ With prefix TO-CURRENT-BUFFER, insert command output into buffer."
 ;;;;;; Beancount
 
 ;; #+BEGIN_SRC emacs-lisp
-(let ((beancount-dir (car (split-string (shell-command-to-string "ghq list --full-path beancount")))))
+(let ((beancount-dir (car (split-string (shell-command-to-string "ghq list --full-path blais/beancount")))))
   (when (and beancount-dir
              (file-directory-p beancount-dir))
     (add-to-list 'load-path (expand-file-name "editors/emacs/"
-- 
cgit 1.4.1


From 234961c3386df99937a4b6851839985f92ed4293 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 18 Sep 2017 18:57:53 +0200
Subject: Emacs: Use correct keybinding syntax for projectile-ripgrep

---
 emacs/.emacs.d/main.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'emacs')

diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index f76c329..2e6eeec 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -521,7 +521,8 @@
 (use-package projectile-ripgrep
   :after (ripgrep projectile)
   :if (executable-find "rg")
-  :bind (("C-c p s r" . projectile-ripgrep)))
+  :bind (:map projectile-command-map
+              ("s r" . projectile-ripgrep)))
 ;; #+END_SRC
 
 ;;;;;; Projectile
-- 
cgit 1.4.1


From 202e6e82054d71cc21ac5f2880e4acf898ccebcb Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 18 Sep 2017 19:04:30 +0200
Subject: Emacs: Enable projectile-mode globally

The function projectile-global-mode no longe rseems to throw
deprecation warnings.
---
 emacs/.emacs.d/main.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'emacs')

diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index 2e6eeec..7b73496 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -540,7 +540,7 @@
   :demand t
   :diminish projectile-mode
   :config (progn
-            (projectile-mode +1)
+            (projectile-global-mode +1)
             (add-to-list 'projectile-globally-ignored-directories ".stversions")
 
             (defun yarn-install (&optional arg)
-- 
cgit 1.4.1


From 08b29615b1932f42fbd05cafc2717eb779769a61 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 18 Sep 2017 19:05:13 +0200
Subject: Emacs: Optimise projectile usage

---
 emacs/.emacs.d/main.el | 1 +
 1 file changed, 1 insertion(+)

(limited to 'emacs')

diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index 7b73496..b749a10 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -542,6 +542,7 @@
   :config (progn
             (projectile-global-mode +1)
             (add-to-list 'projectile-globally-ignored-directories ".stversions")
+            (setq projectile-mode-line "P")
 
             (defun yarn-install (&optional arg)
               (interactive "P")
-- 
cgit 1.4.1