diff --git a/core/core-evil.el b/core/core-evil.el index 878d9ad9e..eaf9838ef 100644 --- a/core/core-evil.el +++ b/core/core-evil.el @@ -74,6 +74,14 @@ )) (evil-set-initial-state `,(car mode-map) `,(cdr mode-map))) + ;; Shortcuts for the evil expression register + (defmacro $= (str &rest args) + `(calc-eval (format ,str ,@args))) + (defmacro $r (char) + `(evil-get-register ,char)) + (defmacro $expand (path) + `(evil-ex-replace-special-filenames ,path)) + (progn ; evil hacks (defadvice evil-force-normal-state (after evil-esc-quit activate) "Close popups, disable search highlights and quit the minibuffer if open." @@ -207,10 +215,6 @@ evil-commentary-line) :config (evil-commentary-mode 1)) -(use-package evil-ex-registers - :commands (evil-get-spec-register - evil-ex-paste-from-register)) - (use-package evil-exchange :commands evil-exchange :config diff --git a/core/core-helm.el b/core/core-helm.el index 99198d54c..f6c0161f1 100644 --- a/core/core-helm.el +++ b/core/core-helm.el @@ -34,7 +34,7 @@ (map! (:map (helm-map helm-generic-files-map helm-find-files-map helm-swoop-map helm-projectile-find-file-map) "C-w" 'backward-kill-word - "C-r" 'evil-ex-paste-from-register ; Evil registers in helm! Glorious! + "C-r" 'evil-paste-from-register ; Evil registers in helm! Glorious! "" 'helm-keyboard-quit [escape] 'helm-keyboard-quit) (:map helm-find-files-map