From 70d0528fc84c88106ea70c0b633834116a7902c5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 28 Jun 2025 11:44:40 +0300 Subject: [PATCH] Fix setting viper-d-com in viper * lisp/emulation/viper-cmd.el (viper-put-back, viper-Put-back): Move setting the marker to after the call to 'viper-set-destructive-command'. Suggested by Michael Scott . (Bug#78220) --- lisp/emulation/viper-cmd.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index aaf875d5dee..95f5507f33a 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -3867,7 +3867,6 @@ Null string will repeat previous search." (setq viper-use-register nil) (error viper-EmptyRegister reg)) (user-error viper-ViperBell))) - (setq viper-use-register nil) (if (viper-end-with-a-newline-p text) (progn (end-of-line) @@ -3879,6 +3878,7 @@ Null string will repeat previous search." (set-marker (mark-marker) (point) (current-buffer)) (viper-set-destructive-command (list 'viper-put-back val nil viper-use-register nil nil)) + (setq viper-use-register nil) (setq sv-point (point)) (viper-loop val (viper-yank text)) (setq chars-inserted (abs (- (point) sv-point)) @@ -3917,10 +3917,10 @@ Null string will repeat previous search." (setq viper-use-register nil) (error viper-EmptyRegister reg)) (user-error viper-ViperBell))) - (setq viper-use-register nil) (if (viper-end-with-a-newline-p text) (beginning-of-line)) (viper-set-destructive-command (list 'viper-Put-back val nil viper-use-register nil nil)) + (setq viper-use-register nil) (set-marker (mark-marker) (point) (current-buffer)) (setq sv-point (point)) (viper-loop val (viper-yank text))