summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2021-09-25 13:15:42 -0500
committerCase Duckworth2021-09-25 13:15:42 -0500
commit450599d91469a0fa97848aa1a80c2c7d610daa25 (patch)
tree491926c3538aa4b4cbaf59825476f849b86c7023
parentAdvise cycle-spacing (diff)
downloademacs-450599d91469a0fa97848aa1a80c2c7d610daa25.tar.gz
emacs-450599d91469a0fa97848aa1a80c2c7d610daa25.zip
Do away with lispy-modes and overcomplex configuration
-rw-r--r--init.el31
-rw-r--r--lisp/acdw-lisp.el11
2 files changed, 17 insertions, 25 deletions
diff --git a/init.el b/init.el index 3c0d2e7..d19d715 100644 --- a/init.el +++ b/init.el
@@ -1914,26 +1914,27 @@ the default is \"/\"."
1914(setup (:straight paredit) 1914(setup (:straight paredit)
1915 ;; I don't use paredit-splice-sexp much, and it stomps on isearch. 1915 ;; I don't use paredit-splice-sexp much, and it stomps on isearch.
1916 (:unbind "M-s") 1916 (:unbind "M-s")
1917 1917
1918 (defun paredit@setup () 1918 (:bind "DEL" #'paredit-backward-delete
1919 "Correct weirdnesses and set up paredit mode." 1919 "C-M-;" #'comment-or-uncomment-sexp
1920 (:with-map lisp-mode-shared-map 1920 "C-<backspace>" #'paredit-backward-kill-word
1921 (:bind "DEL" #'paredit-backward-delete 1921 "M-w" #'paredit-copy-as-kill)
1922 "C-M-;" #'comment-or-uncomment-sexp 1922
1923 "C-<backspace>" #'paredit-backward-kill-word 1923 (:hook-into emacs-lisp-mode
1924 "M-w" #'paredit-copy-as-kill)) 1924 ielm-mode sly-repl-mode
1925 (paredit-mode +1)) 1925 lisp-mode
1926 1926 lisp-interaction-mode
1927 (dolist (mode lispy-modes) 1927 scheme-mode)
1928 (add-hook (intern (format "%s-hook" mode))
1929 #'paredit@setup))
1930 1928
1931 (:also-load eldoc) 1929 (:also-load eldoc)
1932 (eldoc-add-command 'paredit-backward-delete 'paredit-close-round)) 1930 (eldoc-add-command 'paredit-backward-delete 'paredit-close-round))
1933 1931
1934(setup (:straight paren-face) 1932(setup (:straight paren-face)
1935 (dolist (mode lispy-modes) 1933 (:hook-into emacs-lisp-mode
1936 (add-hook (intern (format "%s-hook" mode)) #'paren-face-mode))) 1934 ielm-mode sly-repl-mode
1935 lisp-mode
1936 lisp-interaction-mode
1937 scheme-mode))
1937 1938
1938(setup (:straight-if (pdf-tools 1939(setup (:straight-if (pdf-tools
1939 :host github 1940 :host github
diff --git a/lisp/acdw-lisp.el b/lisp/acdw-lisp.el index 8f551c9..92fe62e 100644 --- a/lisp/acdw-lisp.el +++ b/lisp/acdw-lisp.el
@@ -2,16 +2,6 @@
2;; 2;;
3;; Extras for Lisp modes. 3;; Extras for Lisp modes.
4 4
5(defvar lispy-modes '(emacs-lisp-mode
6 eval-expression-minibuffer
7 ielm-mode
8 lisp-mode
9 lisp-interaction-mode
10 scheme-mode
11 slime-repl-mode
12 sly-mrepl-mode)
13 "List of modes that are lisp-like enough to hook packages into.")
14
15(defun acdw/eval-region-or-buffer () 5(defun acdw/eval-region-or-buffer ()
16 (interactive) 6 (interactive)
17 (if (region-active-p) 7 (if (region-active-p)
@@ -23,3 +13,4 @@
23 (eval-buffer)))) 13 (eval-buffer))))
24 14
25(provide 'acdw-lisp) 15(provide 'acdw-lisp)
16;;; acdw-lisp.el ends here