From 48968f0e713bdb3e6ebef4250521d6fdce33d86f Mon Sep 17 00:00:00 2001
From: stefan schippers <stefan.schippers@gmail.com>
Date: Mon, 25 Aug 2025 09:43:34 +0200
Subject: [PATCH] Fix: aborting a ctrl-v (paste) with escape did leave copied
 objects on top of previous if no second Esc was pressed

---
 src/callback.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/callback.c b/src/callback.c
index 43f208f6..4f2bbf21 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -169,6 +169,11 @@ void abort_operation(void)
      xctx->ui_state &= ~PLACE_SYMBOL;
      xctx->ui_state &= ~PLACE_TEXT;
    }
+   if(xctx->ui_state & STARTMERGE) {
+     delete(1/* to_push_undo */);
+     xctx->ui_state &= ~STARTMERGE;
+     set_modify(0); /* aborted merge: no change, so reset modify flag set by delete() */
+   }
    return;
   }
   if(xctx->ui_state & STARTCOPY)