branch: elpa/meow
commit 675cd12028fd49a7d0aecef1374befecc3a321b1
Author: 45mg <[email protected]>
Commit: GitHub <[email protected]>
Allow custom `delete-region', `insert' functions (#609)
Make it possible to specify which functions are used to delete the
region and insert text.
This is needed to get Meow to work with modes like Vterm, which define
their own `delete-region' and `insert' functions, without massive code
duplication.
---
meow-beacon.el | 2 +-
meow-command.el | 28 ++++++++++++++--------------
meow-util.el | 16 ++++++++++++----
meow-var.el | 11 +++++++++++
4 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/meow-beacon.el b/meow-beacon.el
index 7afe58a703..3bb50b8c19 100644
--- a/meow-beacon.el
+++ b/meow-beacon.el
@@ -506,7 +506,7 @@ The recorded kmacro will be applied to all cursors
immediately."
(delete-overlay ov)))))))
(defun meow--beacon-delete-region ()
- (delete-region (region-beginning) (region-end)))
+ (meow--delete-region (region-beginning) (region-end)))
(defun meow-beacon-kill-delete ()
"Delete all selections.
diff --git a/meow-command.el b/meow-command.el
index 76971d3444..919ad4ce69 100644
--- a/meow-command.el
+++ b/meow-command.el
@@ -275,7 +275,7 @@ This command supports `meow-selection-command-fallback'."
(t
(meow--prepare-region-for-kill)
(let ((s (buffer-substring-no-properties (region-beginning)
(region-end))))
- (delete-region (region-beginning) (region-end))
+ (meow--delete-region (region-beginning) (region-end))
(kill-append (meow--prepare-string-for-kill-append s) nil))))))))
(defun meow-C-k ()
@@ -469,7 +469,7 @@ This command supports `meow-selection-command-fallback'."
(save-mark-and-excursion
(newline))
;; (save-mark-and-excursion
- ;; (insert "\n"))
+ ;; (meow--insert "\n"))
(indent-according-to-mode)))
(defun meow-open-above-visual ()
@@ -515,7 +515,7 @@ This command supports `meow-selection-command-fallback'."
(when (meow--allow-modify-p)
(setq this-command #'meow-change)
(meow--with-selection-fallback
- (delete-region (region-beginning) (region-end))
+ (meow--delete-region (region-beginning) (region-end))
(meow--switch-state 'insert)
(when meow-select-on-change
(setq-local meow--insert-pos (point))))))
@@ -547,9 +547,9 @@ This command supports `meow-selection-command-fallback'."
(let ((select-enable-clipboard meow-use-clipboard))
(when (meow--allow-modify-p)
(when-let ((s (string-trim-right (current-kill 0 t) "\n")))
- (delete-region (region-beginning) (region-end))
+ (meow--delete-region (region-beginning) (region-end))
(set-marker meow--replace-start-marker (point))
- (insert s))))))
+ (meow--insert s))))))
(defun meow-replace-char ()
"Replace current char with selection."
@@ -557,9 +557,9 @@ This command supports `meow-selection-command-fallback'."
(let ((select-enable-clipboard meow-use-clipboard))
(when (< (point) (point-max))
(when-let ((s (string-trim-right (current-kill 0 t) "\n")))
- (delete-region (point) (1+ (point)))
+ (meow--delete-region (point) (1+ (point)))
(set-marker meow--replace-start-marker (point))
- (insert s)))))
+ (meow--insert s)))))
(defun meow-replace-save ()
(interactive)
@@ -573,12 +573,12 @@ This command supports `meow-selection-command-fallback'."
(meow--prepare-region-for-kill)
(buffer-substring-no-properties (region-beginning)
(region-end)))))
(progn
- (delete-region (region-beginning) (region-end))
+ (meow--delete-region (region-beginning) (region-end))
(set-marker meow--replace-start-marker (point))
- (insert s)
+ (meow--insert s)
(kill-new old)))
(set-marker meow--replace-start-marker (point))
- (insert s)))))))
+ (meow--insert s)))))))
(defun meow-replace-pop ()
"Like `yank-pop', but for `meow-replace'.
@@ -606,9 +606,9 @@ For custom commands, see also the user option
(message "`meow-replace-pop': Reached end of kill ring"))
(let ((txt (string-trim-right (current-kill meow--replace-pop-index t)
"\n")))
- (delete-region meow--replace-start-marker (point))
+ (meow--delete-region meow--replace-start-marker (point))
(set-marker meow--replace-start-marker (point))
- (insert txt))))
+ (meow--insert txt))))
(setq this-command 'meow-replace-pop))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1736,8 +1736,8 @@ This command is a replacement for built-in
`kmacro-end-macro'."
(region-str (when (region-active-p) (buffer-substring-no-properties
rbeg rend)))
(sel-str (meow--second-sel-get-string))
(next-marker (make-marker)))
- (when region-str (delete-region rbeg rend))
- (when sel-str (insert sel-str))
+ (when region-str (meow--delete-region rbeg rend))
+ (when sel-str (meow--insert sel-str))
(move-marker next-marker (point))
(meow--second-sel-set-string (or region-str ""))
(when (overlayp mouse-secondary-overlay)
diff --git a/meow-util.el b/meow-util.el
index 784f3ce5a5..a9f2d0c6e8 100644
--- a/meow-util.el
+++ b/meow-util.el
@@ -345,6 +345,14 @@ Looks up the state in meow-replace-state-name-list"
(when-let ((bounds (bounds-of-thing-at-point thing)))
(cons type bounds)))
+(defun meow--insert (&rest args)
+ "Use `meow--insert-function' to insert ARGS at point."
+ (apply meow--insert-function args))
+
+(defun meow--delete-region (start end)
+ "Use `meow--delete-region-function' to delete text between START and END."
+ (funcall meow--delete-region-function start end))
+
(defun meow--push-search (search)
(unless (string-equal search (car regexp-search-ring))
(add-to-history 'regexp-search-ring search regexp-search-ring-max)))
@@ -424,7 +432,7 @@ Looks up the state in meow-replace-state-name-list"
(when (or (member this-command meow-grab-fill-commands)
(member meow--keypad-this-command meow-grab-fill-commands))
(when-let ((s (meow--second-sel-get-string)))
- (insert s))))
+ (meow--insert s))))
(defun meow--parse-string-to-keypad-keys (str)
(let ((strs (split-string str " ")))
@@ -541,12 +549,12 @@ that bound to DEF. Otherwise, return DEF."
((meow--second-sel-buffer)
(with-current-buffer (overlay-buffer mouse-secondary-overlay)
(goto-char (overlay-start mouse-secondary-overlay))
- (delete-region (overlay-start mouse-secondary-overlay) (overlay-end
mouse-secondary-overlay))
- (insert string)))
+ (meow--delete-region (overlay-start mouse-secondary-overlay)
(overlay-end mouse-secondary-overlay))
+ (meow--insert string)))
((markerp mouse-secondary-start)
(with-current-buffer (marker-buffer mouse-secondary-start)
(goto-char (marker-position mouse-secondary-start))
- (insert string)))))
+ (meow--insert string)))))
(defun meow--second-sel-get-string ()
(when (meow--second-sel-buffer)
diff --git a/meow-var.el b/meow-var.el
index 8bb2ed219b..7c6f34d305 100644
--- a/meow-var.el
+++ b/meow-var.el
@@ -518,6 +518,17 @@ Use (setq meow-keypad-describe-keymap-function \\='nil) to
disable popup.")
(defvar meow--kbd-goto-line "M-g g"
"KBD macro for command `goto-line'.")
+(defvar meow--delete-region-function #'delete-region
+ "The function used to delete the selection.
+
+Allows support of modes that define their own equivalent of
+`delete-region'.")
+
+(defvar meow--insert-function #'insert
+ "The function used to insert text in Normal state.
+
+Allows support of modes that define their own equivalent of `insert'.")
+
(defvar-local meow--indicator nil
"Indicator for current buffer.")
