diff --git a/core/core-evil.el b/core/core-evil.el index fc4a5efb5..4f934fb70 100644 --- a/core/core-evil.el +++ b/core/core-evil.el @@ -79,22 +79,9 @@ See `https://bitbucket.org/lyro/evil/issue/527'" ;; Hide keystroke display while isearch is active (add-hook! isearch-mode (setq echo-keystrokes 0)) (add-hook! isearch-mode-end (setq echo-keystrokes 0.02)) - (bind! :map isearch-mode-map - "C-r" nil - - "C-r %" (λ (narf/isearch-paste-from-register ?%)) - "C-r #" (λ (narf/isearch-paste-from-register ?#)) - "C-r /" (λ (narf/isearch-paste-from-register ?/)) - "C-r :" (λ (narf/isearch-paste-from-register ?:)) - "C-r ." (λ (narf/isearch-paste-from-register ?.)) - "C-r -" (λ (narf/isearch-paste-from-register ?-)) - "C-r _" (λ (narf/isearch-paste-from-register ?_)) - "C-r =" (λ (narf/isearch-paste-from-register ?=)) - "C-r +" 'narf/isearch-paste-from-clipboard - - "C-w" 'narf/isearch-delete-word - "C-u" 'narf/isearch-delete-line - "M-v" 'narf/isearch-paste-from-clipboard))) + (bind! :map evil-ex-search-keymap + "C-w" 'evil-delete-backward-word + "C-u" 'evil-delete-whole-line))) ;; evil plugins (use-package evil-anzu) diff --git a/core/lib/defuns-isearch.el b/core/lib/defuns-isearch.el deleted file mode 100644 index 4f102cc5b..000000000 --- a/core/lib/defuns-isearch.el +++ /dev/null @@ -1,34 +0,0 @@ -;;; defuns-isearch.el - -;;;###autoload -(defun narf/isearch-delete-word () - (interactive) - (let ((num (length isearch-string)) - (string (s-reverse isearch-string))) - (when (string-match "[^a-zA-Z0-9]" string 1) - (setq num (match-beginning 0))) - (dotimes (i num) - (isearch-pop-state)) - (isearch-update))) - -;;;###autoload -(defun narf/isearch-delete-line () - (interactive) - (let ((num (length isearch-string))) - (dotimes (i num) (isearch-pop-state)) - (isearch-update))) - -;;;###autoload -(defun narf/isearch-paste-from-register (reg) - (interactive) - (let ((str (evil-get-register reg t))) - (when (> (length str) 0) - (isearch-yank-string str)))) - -;;;###autoload -(defun narf/isearch-paste-from-clipboard () - (interactive) - (narf:isearch-paste-from-register ?+)) - -(provide 'defuns-isearch) -;;; defuns-isearch.el ends here