[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 41d4c09 23/92: Fixed model issue when all files in added s
From: |
Alexey Veretennikov |
Subject: |
[elpa] master 41d4c09 23/92: Fixed model issue when all files in added subtree looks like directories |
Date: |
Thu, 11 Jun 2015 19:47:56 +0000 |
branch: master
commit 41d4c0935e65e4b818e7b43b94f4ed4a6da8361d
Author: Alexey Veretennikov <address@hidden>
Commit: Alexey Veretennikov <address@hidden>
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)
- [elpa] master aa7f07a 10/92: Added Backspace support, (continued)
- [elpa] master aa7f07a 10/92: Added Backspace support, Alexey Veretennikov, 2015/06/11
- [elpa] master eb4ad8e 19/92: Removed test code!, Alexey Veretennikov, 2015/06/11
- [elpa] master 457f48e 13/92: Updated readme, Alexey Veretennikov, 2015/06/11
- [elpa] master 33fe3a2 14/92: Added support for double backspace for closing open directories, Alexey Veretennikov, 2015/06/11
- [elpa] master 70d8bc5 17/92: Updated - aligned 80 chars in width, Alexey Veretennikov, 2015/06/11
- [elpa] master 5bbcfcf 18/92: Started diff model, Alexey Veretennikov, 2015/06/11
- [elpa] master b1de530 16/92: Isolated tree 'control' from the directory model, Alexey Veretennikov, 2015/06/11
- [elpa] master 7eb950e 22/92: Updated readme, Alexey Veretennikov, 2015/06/11
- [elpa] master 1279a61 28/92: Added face argument for ztree-draw-char and set face for vertical line in 2 trees mode, Alexey Veretennikov, 2015/06/11
- [elpa] master 120ffcb 15/92: Preparing to isolate ztree from directories api, Alexey Veretennikov, 2015/06/11
- [elpa] master 41d4c09 23/92: Fixed model issue when all files in added subtree looks like directories,
Alexey Veretennikov <=
- [elpa] master 2f888c5 26/92: Added util file, Alexey Veretennikov, 2015/06/11
- [elpa] master 41ab149 29/92: Added sorting to the tree, Alexey Veretennikov, 2015/06/11
- [elpa] master d0e255e 20/92: Implemented difftree model, Alexey Veretennikov, 2015/06/11
- [elpa] master a39e8c6 24/92: Started preparation for 2 column tree, Alexey Veretennikov, 2015/06/11
- [elpa] master 3260487 25/92: Preparing for the double tree drawing, Alexey Veretennikov, 2015/06/11
- [elpa] master 8685235 27/92: Added support for 2 trees, Alexey Veretennikov, 2015/06/11
- [elpa] master 28fa370 33/92: Reimplemented search for node by line using hash table, Alexey Veretennikov, 2015/06/11
- [elpa] master 413cff4 30/92: Drawing trees only to visible items, Alexey Veretennikov, 2015/06/11
- [elpa] master 161b1b3 35/92: Added messages, Alexey Veretennikov, 2015/06/11
- [elpa] master 9b91d44 31/92: Implemented colors support for different files, Alexey Veretennikov, 2015/06/11