emacs
/
evil-collection
mirror of https://github.com/jojojames/evil-collection.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Elisp: Support eval-print-last-sexp when evil-move-beyond-eol is nil

This commit is contained in:
James Nguyen 2017-12-04 18:20:26 -08:00
parent 701d127bcd
commit 7d24430b68
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
evil-elisp-mode.el
View File

@ -57,8 +57,19 @@ alternative printed representations that can be displayed."
(lookup-key (current-global-map) (kbd "C-m")))
(call-interactively 'elisp-last-sexp-toggle-display)))
(defun evil-elisp-mode-last-sexp (command &rest args)
"In normal-state or motion-state, last sexp ends at point."
(if (and (not evil-move-beyond-eol)
(or (evil-normal-state-p) (evil-motion-state-p)))
(save-excursion
(unless (or (eobp) (eolp)) (forward-char))
(apply command args))
(apply command args)))
(defun evil-elisp-mode-setup ()
"Set up `evil' bindings for `elisp-mode'."
(unless evil-move-beyond-eol
(advice-add 'eval-print-last-sexp :around 'evil-elisp-mode-last-sexp))
(advice-add 'last-sexp-setup-props
:override 'evil-elisp-mode-last-sexp-setup-props))