From 567b4c9cf4906a49a90a421d7957935552ead43e Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Fri, 31 Oct 2014 15:16:38 +0100
Subject: Use ruby-mode, update settings

---
 emacs/.emacs.d/Cask     |  1 -
 emacs/.emacs.d/init.el  |  3 ---
 emacs/.emacs.d/init.org | 19 ++++++++++++++++++-
 3 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'emacs')

diff --git a/emacs/.emacs.d/Cask b/emacs/.emacs.d/Cask
index 7e56b33..50f6704 100644
--- a/emacs/.emacs.d/Cask
+++ b/emacs/.emacs.d/Cask
@@ -27,7 +27,6 @@
 (depends-on "e2wm")
 (depends-on "elnode")
 (depends-on "emms")
-(depends-on "enh-ruby-mode")
 (depends-on "eshell-fringe-status")
 (depends-on "esxml")
 (depends-on "evil")
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 42d2fbd..34611ce 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -1360,9 +1360,6 @@ from myaethon2.core.decorators import (
   #'oni:python-mode-func #'oni:set-python-imenu-function
   #'jedi:setup #'subword-mode #'oni:electric-pair-local-mode)
 
-(oni:add-hooks 'ruby-mode-hook
-  #'flycheck-mode #'oni:electric-pair-local-mode)
-
 (oni:add-hooks 'slime-repl-mode-hook
   #'paredit-mode #'set-up-slime-ac #'hl-sexp-mode)
 
diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index cd9e358..5e660c8 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -1064,9 +1064,26 @@
    - Automatically match parentheses and other delimiters.
 
      #+BEGIN_SRC emacs-lisp
-       (add-hook 'enh-ruby-mode-hook #'oni:electric-pair-local-mode)
+       (add-hook 'ruby-mode-hook #'oni:electric-pair-local-mode)
      #+END_SRC
 
+   - Enable flycheck
+
+     #+BEGIN_SRC emacs-lisp
+       (declare-function flycheck-mode "flycheck")
+
+       (add-hook 'ruby-mode-hook #'flycheck-mode)
+     #+END_SRC
+
+   - Align chained method calls
+
+     #+BEGIN_SRC emacs-lisp
+       (defvar ruby-align-chained-calls)
+
+       (setq ruby-align-chained-calls t)
+     #+END_SRC
+
+
 ** Coffee
 
    - Autimatically match parentheses and other delimiters.
-- 
cgit v1.2.3-54-g00ecf