Skip to content

Fix new bugs of vi-mode introduced by #952 #964

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

Merged
cxxxr merged 4 commits into from
Aug 19, 2023
Merged

Fix new bugs of vi-mode introduced by #952 #964

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f277de
Fix 'd%' to work regardless of whether the direction is forward or ba…
fukamachi Aug 17, 2023
5b11e38
Fix vi-mode not to expand the region if the start and the end is the …
fukamachi Aug 17, 2023
5d81ca1
Fix 'd' & 'y' in vi-mode to work for visual-block mode.
fukamachi Aug 17, 2023
ddf196c
Refactor code in define-vi-operator regarding visual mode.
fukamachi Aug 17, 2023
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
Next Next commit
Fix 'd%' to work regardless of whether the direction is forward or ba… 
…ckward.
  • Loading branch information
@fukamachi
fukamachi committed Aug 17, 2023
commit 2f277de5c130fb781dde91dfebd7d4e1afa0de9b
8 changes: 4 additions & 4 deletions extensions/vi-mode/commands.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,12 +447,12 @@
(redo n)
(fall-within-line (current-point)))

(defun vi-forward-matching-paren (window point &optional (offset *cursor-offset*))
(declare (ignore window offset))
(defun vi-forward-matching-paren (window point &optional (offset -1))
(declare (ignore window))
(with-point ((point point))
(when (syntax-open-paren-char-p (character-at point))
(when (scan-lists point 1 0 t)
(character-offset point *cursor-offset*)))))
(character-offset point offset)))))

(defun vi-backward-matching-paren (window point &optional (offset -1))
(declare (ignore window offset))
Expand All @@ -463,7 +463,7 @@
(:type :inclusive
:jump t)
(alexandria:when-let ((p (or (vi-backward-matching-paren (current-window) (current-point))
(vi-forward-matching-paren (current-window) (current-point) *cursor-offset*))))
(vi-forward-matching-paren (current-window) (current-point)))))
(move-point (current-point) p)))

(let ((old-forward-matching-paren)
Expand Down