1 files changed, 20 insertions, 3 deletions
diff --git a/main.c b/main.c
index fa4308d..e439b30 100644
--- a/main.c
+++ b/main.c
@@ -1634,12 +1634,29 @@ static const char *replace(Vis *vis, const char *keys, const Arg *arg) {
 		vis_keymap_disable(vis);
 		return NULL;
 	}
+
 	const char *next = vis_keys_next(vis, keys);
 	if (!next)
 		return NULL;
-	vis_operator(vis, VIS_OP_MODESWITCH, VIS_MODE_REPLACE);
-	vis_motion(vis, VIS_MOVE_NOP);
-	vis_keys_feed(vis, keys);
+
+	char replacement[64];
+	size_t len = next - keys;
+	if (len >= sizeof(replacement))
+		return next;
+
+	memcpy(replacement, keys, len);
+	replacement[len] = '\0';
+
+	if (vis_mode_get(vis) == VIS_MODE_NORMAL) {
+		int count = vis_count_get_default(vis, 1);
+		vis_operator(vis, VIS_OP_CHANGE);
+		vis_motion(vis, VIS_MOVE_CHAR_NEXT);
+		for (; count > 0; count--)
+			vis_keys_feed(vis, replacement);
+	} else {
+		vis_operator(vis, VIS_OP_REPLACE, replacement);
+	}
+
 	vis_keys_feed(vis, "<Escape>");
 	return next;
 }