ahamilton/diff-edit
1
0
Fork 0
Code Releases Activity

Resolving diffs should add to undo history like other change actions

Browse source
This commit is contained in:
Andrew Hamilton 2022-04-30 06:59:58 +10:00
parent 239b2b9aaf
commit 2c850b73f4
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
diff_edit/__init__.py
View file

@ -237,11 +237,13 @@ class DiffEditor:
left_y = left_start - left_scroll + 1 # 1 for header left_y = left_start - left_scroll + 1 # 1 for header
right_y = right_start - right_scroll + 1 # 1 for header right_y = right_start - right_scroll + 1 # 1 for header
if x == left_x and left_y == y: if x == left_x and left_y == y:
self.left_editor.add_to_history()
self.left_editor.text_widget[left_start:left_end] = \ self.left_editor.text_widget[left_start:left_end] = \
[self.right_editor.text_widget[line_num] [self.right_editor.text_widget[line_num]
for line_num in range(right_start, right_end)] for line_num in range(right_start, right_end)]
self.diff_changed() self.diff_changed()
elif x == right_x and right_y == y: elif x == right_x and right_y == y:
self.right_editor.add_to_history()
self.right_editor.text_widget[right_start:right_end] = \ self.right_editor.text_widget[right_start:right_end] = \
[self.left_editor.text_widget[line_num] [self.left_editor.text_widget[line_num]
for line_num in range(left_start, left_end)] for line_num in range(left_start, left_end)]