From 2c850b73f42e33d6b14c1a3ba3b503b3e0be81c1 Mon Sep 17 00:00:00 2001 From: Andrew Hamilton Date: Sat, 30 Apr 2022 06:59:58 +1000 Subject: [PATCH] Resolving diffs should add to undo history like other change actions --- diff_edit/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/diff_edit/__init__.py b/diff_edit/__init__.py index 2951bfe..13af609 100755 --- a/diff_edit/__init__.py +++ b/diff_edit/__init__.py @@ -237,11 +237,13 @@ class DiffEditor: left_y = left_start - left_scroll + 1 # 1 for header right_y = right_start - right_scroll + 1 # 1 for header if x == left_x and left_y == y: + self.left_editor.add_to_history() self.left_editor.text_widget[left_start:left_end] = \ [self.right_editor.text_widget[line_num] for line_num in range(right_start, right_end)] self.diff_changed() elif x == right_x and right_y == y: + self.right_editor.add_to_history() self.right_editor.text_widget[right_start:right_end] = \ [self.left_editor.text_widget[line_num] for line_num in range(left_start, left_end)]