Get rid of newline-and-indent

The electric layout mode takes care of this.

1 files changed, 5 insertions, 43 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 0f69cbd..012cf77 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -171,8 +171,7 @@ MODE1 is enabled and vice-versa."
 
 (defun oni:c-mode-func ()
   "Function for `c-mode-hook'."
-  (local-set-key [f9] 'compile)
-  (local-set-key "\C-j" 'oni:newline-and-indent))
+  (local-set-key [f9] 'compile))
 
 (defun oni:change-number-at-point (change-func)
   "Use CHANGE-FUNC to change the number at `point'."
@@ -189,10 +188,6 @@ MODE1 is enabled and vice-versa."
         (funcall regfunc (point) (- (point) num))
       (funcall wordfunc -1))))
 
-(defun oni:css-mode-func ()
-  "Function for `css-mode-hook'."
-  (local-set-key "\C-j" 'oni:newline-and-indent))
-
 (defun oni:current-dir-in-buffer-name ()
   (let ((branch
          (shell-command-to-string
@@ -257,8 +252,7 @@ MODE1 is enabled and vice-versa."
 
 (defun oni:go-mode-func ()
   "Function for `go-mode-hook'."
-  (setq indent-tabs-mode nil)
-  (local-set-key "\C-j" 'oni:newline-and-indent))
+  (setq indent-tabs-mode nil))
 
 (defun oni:haskell-mode-func ()
   "Function for `haskell-mode-hook'."
@@ -327,18 +321,6 @@ If COUNT has been specified indent by that much, otherwise look at
                (kill-buffer)
              (signal (car err) (cdr err))))))
 
-(defun oni:java-mode-func ()
-  "Function for `java-mode-hook'."
-  (local-set-key "\C-j" 'oni:newline-and-indent))
-
-(defun oni:js-mode-func ()
-  "Function for `js-mode-hook'."
-  (local-set-key "\C-j" 'oni:newline-and-indent))
-
-(defun oni:js2-mode-func ()
-  "Function for `js2-mode-hook'."
-  (oni:js-mode-func))
-
 (defun oni:level (lst)
   "Reduce a 2-level list LST to a flat list."
   (let ((lsts (mapcar (lambda (l) (if (listp l) l (list l))) lst)))
@@ -467,22 +449,8 @@ PLIST contains all the pertinent information."
       (format "* ACQUIRE %s %s - %s \n  SCHEDULED: <%s>"
               title episode name date))))
 
-(defun oni:newline-and-indent ()
-  "`newline-and-indent', but with a twist.
-When dealing with braces, add another line and indent that too."
-  (interactive)
-  (if (and (not (or (= (point) (point-max))
-                    (= (point) (point-min))))
-           (or (and (char-equal (char-before) ?{)
-                    (char-equal (char-after) ?}))
-               (and (char-equal (char-before) ?\()
-                    (char-equal (char-after) ?\)))))
-      (save-excursion (newline-and-indent)))
-  (newline-and-indent))
-
 (defun oni:php-mode-func ()
   "Function for `php-mode-hook'."
-  (local-set-key "\C-j" 'oni:newline-and-indent)
   (c-set-offset 'arglist-intro '+)
   (c-set-offset 'arglist-close '0)
   (setq-local fci-rule-column 80))
@@ -1347,11 +1315,12 @@ from myaethon2.core.decorators import (
 (add-hook 'after-save-hook 'oni:after-save-func t)
 (add-hook 'before-save-hook 'oni:before-save-func)
 (add-hook 'comint-mode-hook #'oni:turn-on-compilation-shell-for-pony)
+(add-hook 'css-mode-hook #'rainbow-mode)
 (add-hook 'diary-display-hook 'oni:diary-display-func)
 (add-hook 'git-commit-mode-hook #'oni:set-ispell-local-en-dict)
 (add-hook 'haskell-mode-hook 'oni:haskell-mode-func)
-(add-hook 'java-mode-hook 'oni:java-mode-func)
 (add-hook 'org-mode-hook #'yas-minor-mode)
+(add-hook 'js-mode-hook #'moz-minor-mode)
 (add-hook 'outline-minor-mode-hook #'oni:set-tab-maybe-toggle-outline)
 (add-hook 'slime-mode-hook #'set-up-slime-ac)
 (add-hook 'sql-interactive-mode-hook #'oni:augment-sql-prompt)
@@ -1376,9 +1345,6 @@ from myaethon2.core.decorators import (
 (oni:add-hooks 'c-mode-hook
   #'oni:c-mode-func #'oni:electric-pair-local-mode)
 
-(oni:add-hooks 'css-mode-hook
-  #'oni:css-mode-func #'rainbow-mode)
-
 (oni:add-hooks 'emacs-lisp-mode-hook
   #'oni:locally-enable-double-spaces #'oni:set-emacs-lisp-symbols
   #'paredit-mode #'flycheck-mode #'eldoc-mode #'oni:set-emacs-lisp-keys)
@@ -1404,12 +1370,8 @@ from myaethon2.core.decorators import (
   #'oni:set-keys-for-jabber-chat #'oni:make-readable
   #'oni:reset-default-directory)
 
-(oni:add-hooks 'js-mode-hook
-  #'moz-minor-mode #'oni:js-mode-func)
-
 (oni:add-hooks 'js2-mode-hook
-  #'tern-mode #'oni:js2-mode-func #'moz-minor-mode
-  #'oni:electric-pair-local-mode)
+  #'tern-mode #'moz-minor-mode #'oni:electric-pair-local-mode)
 
 (oni:add-hooks 'lisp-mode-hook
   #'oni:set-emacs-lisp-symbols #'paredit-mode)