sascha/vlfi
1
0
Fork 0
mirror of https://github.com/m00natic/vlfi.git synced 2025-10-31 07:03:35 +00:00
Code Issues Releases Wiki Activity

Update buffer name on user interruption during ediff.

Browse Source
This commit is contained in:
Andrey Kotlarski
2014-01-22 02:40:53 +02:00
parent d7766f2a3b
commit 0fa8e8d6bf
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vlf-ediff.el
View File

@@ -220,10 +220,10 @@ logical chunks in case there is no difference at the current ones."
(unless done (unless done
(set-buffer buffer-A) (set-buffer buffer-A)
(set-buffer-modified-p nil) (set-buffer-modified-p nil)
(vlf-move-to-chunk (car chunk-A) (cdr chunk-A) t) (vlf-move-to-chunk (car chunk-A) (cdr chunk-A))
(set-buffer buffer-B) (set-buffer buffer-B)
(set-buffer-modified-p nil) (set-buffer-modified-p nil)
(vlf-move-to-chunk (car chunk-B) (cdr chunk-B) t) (vlf-move-to-chunk (car chunk-B) (cdr chunk-B))
(set-buffer ediff-buffer) (set-buffer ediff-buffer)
(ediff-update-diffs) (ediff-update-diffs)
(vlf-ediff-refine buffer-A buffer-B)))))) (vlf-ediff-refine buffer-A buffer-B))))))