diff options
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/elisp/electric-return.el | 16 | ||||
| -rw-r--r-- | emacs/init.el | 7 |
2 files changed, 1 insertions, 22 deletions
diff --git a/emacs/elisp/electric-return.el b/emacs/elisp/electric-return.el deleted file mode 100644 index fcbebb3..0000000 --- a/emacs/elisp/electric-return.el +++ /dev/null @@ -1,16 +0,0 @@ -(defvar electrify-return-match - "[\]}\)\"]" - "If this regexp matches the text after the cursor, do an \"electric\" - return.") -(defun electrify-return-if-match (arg) - "If the text after the cursor matches `electrify-return-match' then - open and indent an empty line between the cursor and the text. Move the - cursor to the new line." - (interactive "P") - (let ((case-fold-search nil)) - (if (looking-at electrify-return-match) - (save-excursion (newline-and-indent))) - (newline arg) - (indent-according-to-mode))) -;; Using local-set-key in a mode-hook is a better idea. -;(global-set-key (kbd "RET") 'electrify-return-if-match) \ No newline at end of file diff --git a/emacs/init.el b/emacs/init.el index b0fefcf..af79db7 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -786,9 +786,6 @@ Also returns nil if pid is nil." (setq autopair-blink nil autopair-skip-whitespace nil))) -(use-package electric-return - :bind (("RET" . electrify-return-if-match))) - (use-package expand-region :bind ("C-M-SPC" . er/expand-region)) @@ -855,9 +852,7 @@ Also returns nil if pid is nil." (show-paren-mode t) (setq indent-tabs-mode nil) - - (local-set-key (kbd "RET") 'electrify-return-if-match) - (local-set-key (kbd "C-j") 'electrify-return-if-match)) + (local-set-key (kbd "RET") #'paredit-newline)) (add-hook 'emacs-lisp-mode-hook #'ap/lisp-setup) (add-hook 'emacs-lisp-mode-hook #'turn-on-eldoc-mode) |