sascha/vlfi
1
0
Fork 0
mirror of https://github.com/m00natic/vlfi.git synced 2025-04-18 16:50:19 +01:00
Code Issues Releases Wiki Activity

Refine diff adjustment and in case of equality after it - make another

Browse Source 
search for difference.
This commit is contained in:
Andrey Kotlarski 2014-01-18 16:26:25 +02:00
parent 9646b00215
commit 82fd5b943b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vlf-base.el
View File

@ -168,7 +168,7 @@ bytes added to the end."
(point-max))))))) (point-max)))))))
(cond ((< vlf-start-pos start) (cond ((< vlf-start-pos start)
(let* ((del-pos (byte-to-position (let* ((del-pos (byte-to-position
(- start vlf-start-pos))) (1+ (- start vlf-start-pos))))
(del-len (length (encode-coding-region (del-len (length (encode-coding-region
(point-min) del-pos (point-min) del-pos
buffer-file-coding-system buffer-file-coding-system

6
vlf-ediff.el
View File

@ -177,6 +177,9 @@ of difference list."
(when (< 0 ediff-number-of-differences) (when (< 0 ediff-number-of-differences)
(vlf-ediff-adjust buffer-A buffer-B t) (vlf-ediff-adjust buffer-A buffer-B t)
(vlf-ediff-adjust buffer-A buffer-B) (vlf-ediff-adjust buffer-A buffer-B)
(if (< 0 ediff-number-of-differences)
(save-excursion
(vlf-ediff-next buffer-A buffer-B 'vlf-next-chunk)))
(ediff-jump-to-difference 1))) (ediff-jump-to-difference 1)))
ad-do-it)) ad-do-it))
@ -198,6 +201,9 @@ beginning of difference list."
(when (< 0 ediff-number-of-differences) (when (< 0 ediff-number-of-differences)
(vlf-ediff-adjust buffer-A buffer-B) (vlf-ediff-adjust buffer-A buffer-B)
(vlf-ediff-adjust buffer-A buffer-B t) (vlf-ediff-adjust buffer-A buffer-B t)
(if (< 0 ediff-number-of-differences)
(save-excursion
(vlf-ediff-next buffer-A buffer-B 'vlf-prev-chunk)))
(ediff-jump-to-difference -1))) (ediff-jump-to-difference -1)))
ad-do-it)) ad-do-it))