From fcc0e0ed5dfe88cb84a5c56d786a062f64b1d78f Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 27 Mar 2015 14:10:19 +0000
Subject: Emacs: Check before loading oracle-mode

---
 tag-emacs/emacs.d/init.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'tag-emacs/emacs.d/init.el')

diff --git a/tag-emacs/emacs.d/init.el b/tag-emacs/emacs.d/init.el
index 39f7b539..355e6a01 100644
--- a/tag-emacs/emacs.d/init.el
+++ b/tag-emacs/emacs.d/init.el
@@ -879,10 +879,11 @@ mouse-1: Display Line and Column Mode Menu"))))))
 (req-package go-mode
   :mode (("\\.go\\'" . go-mode)))
 
-(req-package oracle
-  :load-path ,(expand-file-name "src/code.google.com/p/go.tools/cmd/oracle/oracle.el" (getenv "GOPATH"))
-  :init (progn
-          (add-hook 'go-mode-hook #'go-oracle-mode)))
+(when (file-exists-p "src/code.google.com/p/go.tools/cmd/oracle/oracle.el")
+  (req-package oracle
+    :load-path ,(expand-file-name "src/code.google.com/p/go.tools/cmd/oracle/oracle.el" (getenv "GOPATH"))
+    :init (progn
+            (add-hook 'go-mode-hook #'go-oracle-mode))))
 
 (req-package company-go
   :require go-mode
-- 
cgit 1.4.1


From 05c7485315107a70e4d7ad333f66954d08c5ceb8 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 27 Mar 2015 14:10:34 +0000
Subject: Emacs: Autoload global-smart-tab-mode

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

(limited to 'tag-emacs/emacs.d/init.el')

diff --git a/tag-emacs/emacs.d/init.el b/tag-emacs/emacs.d/init.el
index 355e6a01..37b110e2 100644
--- a/tag-emacs/emacs.d/init.el
+++ b/tag-emacs/emacs.d/init.el
@@ -228,6 +228,7 @@
       completion-ignore-case t)
 
 (req-package smart-tab
+  :commands (global-smart-tab-mode)
   :init (global-smart-tab-mode)
   :config (progn
             (nconc smart-tab-completion-functions-alist '((php-mode . php-complete-function)))
-- 
cgit 1.4.1


From 4b46b6cf7c314f724c6d2e77d3fa492e14da428c Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 27 Mar 2015 14:11:00 +0000
Subject: Emacs: Fix eshell init

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

(limited to 'tag-emacs/emacs.d/init.el')

diff --git a/tag-emacs/emacs.d/init.el b/tag-emacs/emacs.d/init.el
index 37b110e2..62581784 100644
--- a/tag-emacs/emacs.d/init.el
+++ b/tag-emacs/emacs.d/init.el
@@ -1033,11 +1033,11 @@ mouse-1: Display Line and Column Mode Menu"))))))
             (add-hook 'eshell-load-hook (lambda ()
                                           (bind-key "C-c C-l" #'helm-eshell-history eshell-mode-map)))
             (req-package em-smart
-              :init (progn
-                      (setq eshell-where-to-jump 'begin
-                            eshell-review-quick-commands nil
-                            eshell-smart-space-goes-to-end t)
-                      (eshell-smart-initialize)))))
+              :config (progn
+                        (setq eshell-where-to-jump 'begin
+                              eshell-review-quick-commands nil
+                              eshell-smart-space-goes-to-end t)
+                        (eshell-smart-initialize)))))
 
 (autoload #'eshell/cd "em-dirs")
 (defun eshell-goto-current-dir (&optional arg)
-- 
cgit 1.4.1


From f8025d37533262930738d89121fe8bc34f75eb8d Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 27 Mar 2015 14:11:43 +0000
Subject: Emacs: Remove unneeded diminish line

---
 tag-emacs/emacs.d/init.el | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tag-emacs/emacs.d/init.el')

diff --git a/tag-emacs/emacs.d/init.el b/tag-emacs/emacs.d/init.el
index 62581784..10de52e5 100644
--- a/tag-emacs/emacs.d/init.el
+++ b/tag-emacs/emacs.d/init.el
@@ -429,7 +429,6 @@
 
 (req-package ws-butler
   :if window-system
-  :diminish highlight-changes-mode
   :config (ws-butler-global-mode 1))
 (if (daemonp)
     (add-hook #'before-make-frame-hook (lambda () (ws-butler-global-mode 1))))
-- 
cgit 1.4.1