about summary refs log tree commit diff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/emacs/init.el6
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/emacs/init.el b/tools/emacs/init.el
index ea149550110a..eb78461433a2 100644
--- a/tools/emacs/init.el
+++ b/tools/emacs/init.el
@@ -93,6 +93,8 @@
                           ;; Don't indent after '>' while I'm writing
                           (local-set-key ">" 'self-insert-command)))))
 
+(use-package f)
+
 (use-package go-mode
   :bind (:map go-mode-map ("C-c C-r" . recompile)
          :map go-mode-map ("<tab>" . company-indent-or-complete-common))
@@ -151,6 +153,10 @@
   (telephone-line-setup)
   (ace-window-display-mode))
 
+;; If a local configuration file exists, it should be loaded.
+(let ((local-file (expand-file-name (f-join user-emacs-directory "local.el"))))
+  (when (f-exists? local-file)
+    (load local-file)))
 
 ;; Some packages can only be initialised after the rest of the
 ;; settings has been applied: