1 files changed, 3 insertions, 10 deletions
diff --git a/.emacs b/.emacs
index fc4e0de..3d48a4a 100644
--- a/.emacs
+++ b/.emacs
@@ -321,17 +321,10 @@
           (lambda ()
             (ibuffer-switch-to-saved-filter-groups "my/ibuffer-groups")))
 
-
-;; Minor modes configuration
-
-;; See erc-modules customization above for an explanation on these
-;; shenanigans.  tl;dr I do not want to maintain an exhaustive list of
-;; whitespace elements and risk missing out on future additions to the
-;; default value; I just want to remove one specific item.
-(eval-after-load 'whitespace
+(eval-after-load 'org-keys
   '(progn
-     (let ((new-items (remq 'lines whitespace-style)))
-       (customize-set-variable 'whitespace-style new-items))))
+     (define-key org-mode-map (kbd "C-j") 'org-return)
+     (define-key org-mode-map (kbd "RET") 'org-return-indent)))
 
 
 ;; Helper functions and miscellaneous settings.