branch: master
commit 41d4c0935e65e4b818e7b43b94f4ed4a6da8361d
Author: Alexey Veretennikov <[email protected]>
Commit: Alexey Veretennikov <[email protected]>
Fixed model issue when all files in added subtree looks like directories
---
ztree-diff-model.el | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/ztree-diff-model.el b/ztree-diff-model.el
index 02ee290..3b76368 100644
--- a/ztree-diff-model.el
+++ b/ztree-diff-model.el
@@ -31,9 +31,6 @@
(file-directory-p left)
(file-directory-p right))))
-
-
-
(defun ztree-diff-model-files-equal (file1 file2)
"Compare files using external diff. Returns t if equal"
(let ((diff-output (shell-command-to-string (concat "diff -q" " " file1 " "
file2))))
@@ -54,15 +51,15 @@
(dolist (file files)
(if (file-directory-p file)
(push (ztree-diff-model-create-node
- (when (eq side 'left) path)
- (when (eq side 'right) path)
+ (when (eq side 'left) file)
+ (when (eq side 'right) file)
(file-short-name file)
(ztree-diff-model-subtree file side)
'new)
result)
(push (ztree-diff-model-create-node
- (when (eq side 'left) path)
- (when (eq side 'right) path)
+ (when (eq side 'left) file)
+ (when (eq side 'right) file)
(file-short-name file)
nil
'new)
