3b18153ea7
`lispyville-end-of-defun' doesn't go to the next defun when point is already at the end of a defun, whereas `lispyville-beginning-of-defun' does. This commit fixes this inconsistency by matching `lispyville-end-of-defun''s behaviour with `lispyville-beginning-of-defun'. `line-end-position' isn't enough because it never returns `t' in normal mode (in normal mode the point can't reach the true end of a line).
51 lines
1.8 KiB
EmacsLisp
51 lines
1.8 KiB
EmacsLisp
;;; editor/lispy/config.el -*- lexical-binding: t; -*-
|
|
|
|
(use-package! lispy
|
|
:hook ((lisp-mode . lispy-mode)
|
|
(emacs-lisp-mode . lispy-mode)
|
|
(ielm-mode . lispy-mode)
|
|
(scheme-mode . lispy-mode)
|
|
(racket-mode . lispy-mode)
|
|
(hy-mode . lispy-mode)
|
|
(lfe-mode . lispy-mode)
|
|
(dune-mode . lispy-mode)
|
|
(clojure-mode . lispy-mode)
|
|
(fennel-mode . lispy-mode))
|
|
:init
|
|
(add-hook! 'eval-expression-minibuffer-setup-hook
|
|
(defun doom-init-lispy-in-eval-expression-h ()
|
|
"Enable `lispy-mode' in the minibuffer for `eval-expression'."
|
|
(lispy-mode)
|
|
;; When `lispy-key-theme' has `parinfer', the TAB key doesn't do
|
|
;; completion, neither (kbd "<tab>"/"TAB"/"C-i")/[tab]/"\C-i" works in
|
|
;; terminal as tested so remapping is used as a workaround
|
|
(local-set-key (vector 'remap (lookup-key lispy-mode-map (kbd "TAB"))) #'completion-at-point)))
|
|
:config
|
|
(setq lispy-close-quotes-at-end-p t)
|
|
(add-hook 'lispy-mode-hook #'turn-off-smartparens-mode))
|
|
|
|
|
|
(use-package! lispyville
|
|
:when (featurep! :editor evil)
|
|
:hook (lispy-mode . lispyville-mode)
|
|
:init
|
|
(setq lispyville-key-theme
|
|
'((operators normal)
|
|
c-w
|
|
(prettify insert)
|
|
(atom-movement t)
|
|
slurp/barf-lispy
|
|
additional
|
|
additional-insert))
|
|
:config
|
|
(lispyville-set-key-theme)
|
|
;; REVIEW Delete this once https://github.com/noctuid/lispyville/pull/297 is merged
|
|
(defadvice! +lispy--fix-lispyville-end-of-defun-a (_)
|
|
"lispyville-end-of-defun doesn't go to the next defun when
|
|
point is already at the end of a defun, whereas
|
|
lispyville-beginning-of-defun does."
|
|
:before #'lispyville-end-of-defun
|
|
(when (<= (- (line-end-position)
|
|
(point))
|
|
1)
|
|
(forward-line))))
|