Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

make C-w in ex, search, and eval match insert and replace #1922

Merged
merged 2 commits into from
Jul 10, 2024
Merged

make C-w in ex, search, and eval match insert and replace #1922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ce5ad0
make C-w in ex and search match insert and replace
totallyuniquelily Jul 9, 2024
58e67f9
fix evil-delete-backward-word in ex test
totallyuniquelily Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions evil-maps.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ included in `evil-insert-state-bindings' by default."
(define-key evil-command-line-map "\C-u" 'evil-delete-whole-line)
(define-key evil-command-line-map "\C-v" #'quoted-insert)
(when evil-want-C-w-delete
(define-key evil-command-line-map "\C-w" #'backward-kill-word))
(define-key evil-command-line-map "\C-w" #'evil-delete-backward-word))
(define-key evil-command-line-map [escape] #'abort-recursive-edit)
(define-key evil-command-line-map [S-left] #'backward-word)
(define-key evil-command-line-map [S-right] #'forward-word)
Expand Down Expand Up @@ -653,7 +653,7 @@ included in `evil-insert-state-bindings' by default."
(define-key evil-eval-map "\C-n" #'next-complete-history-element)
(define-key evil-eval-map "\C-u" 'evil-delete-whole-line)
(define-key evil-eval-map "\C-v" #'quoted-insert)
(define-key evil-eval-map "\C-w" 'backward-kill-word)
(define-key evil-eval-map "\C-w" 'evil-delete-backward-word)
(define-key evil-eval-map [escape] 'abort-recursive-edit)
(define-key evil-eval-map [S-left] 'backward-word)
(define-key evil-eval-map [S-right] 'forward-word)
Expand Down
9 changes: 7 additions & 2 deletions evil-tests.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2222,7 +2222,7 @@ ine3 line3 line3 l\n"))
"line1\n\n[\n]last line\n")))

(ert-deftest evil-test-delete-backward-word ()
"Test `evil-delete-backward-word' in insert & replace states."
"Test `evil-delete-backward-word' in insert & replace states, and ex command-line."
:tags '(evil)
(ert-info ("evil-delete-backward-word in insert state")
(let ((evil-backspace-join-lines t))
Expand Down Expand Up @@ -2251,7 +2251,12 @@ ine3 line3 line3 l\n"))
("\C-w")
"alpha bravo [c]harlie delta"
("\C-w")
"alpha [b]ravo charlie delta")))
"alpha [b]ravo charlie delta"))
(ert-info ("evil-delete-backward-word in ex command-line")
(evil-test-buffer
"[ ]"
(":normal i" "one-two" (kbd "C-w") (kbd "C-w") [return])
"on[e]")))

(ert-deftest evil-test-visual-X ()
"Test `X' in visual state."
Expand Down
4 changes: 2 additions & 2 deletions evil-vars.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,11 +558,11 @@ ubiquity of prefix arguments."
(cond
((and (not value)
(eq (lookup-key evil-command-line-map (kbd "C-w"))
#'backward-kill-word))
#'evil-delete-backward-word))
(define-key evil-command-line-map (kbd "C-w") nil))
((and value
(null (lookup-key evil-command-line-map (kbd "C-w"))))
(define-key evil-command-line-map (kbd "C-w") #'backward-kill-word))))
(define-key evil-command-line-map (kbd "C-w") #'evil-delete-backward-word))))
(when (boundp 'evil-ex-search-keymap)
(cond
((and (not value)
Expand Down