[elpa] master 45dda44 14/36: Started updating diff logic to include ignored files

[Alexey Veretennikov]

branch: master
commit 45dda44bf60da8d7b19125d70a81602f845ae553
Author: Alexey Veretennikov <address@hidden>
Commit: Alexey Veretennikov <address@hidden>

    Started updating diff logic to include ignored files
---
 ztree-diff-model.el |    4 ++--
 ztree-diff.el       |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ztree-diff-model.el b/ztree-diff-model.el
index 0801e55..3062af3 100644
--- a/ztree-diff-model.el
+++ b/ztree-diff-model.el
@@ -205,7 +205,7 @@ Argument SIDE either 'left or 'right side."
 
 (defun ztree-diff-node-update-diff-from-children (node)
   "Set the diff status for the NODE based on its children."
-  ;(unless (eq (ztree-diff-node-different node 'ignore))
+  (unless (eq (ztree-diff-node-different node 'ignore))
     (let ((children (ztree-diff-node-children node))
           (diff nil))
       (dolist (child children)
@@ -214,7 +214,7 @@ Argument SIDE either 'left or 'right side."
                 (ztree-diff-model-update-diff
                  diff
                  (ztree-diff-node-different child)))))
-      (ztree-diff-node-set-different node diff))) ;)
+      (ztree-diff-node-set-different node diff))))
 
 (defun ztree-diff-node-update-all-parents-diff (node)
   "Recursively update all parents diff status for the NODE."
diff --git a/ztree-diff.el b/ztree-diff.el
index 2bf9743..c2ad76f 100644
--- a/ztree-diff.el
+++ b/ztree-diff.el
@@ -117,7 +117,7 @@ By default paths starting with dot (like .git) are ignored")
 (defun ztree-diff-node-face (node)
   "Return the face for the NODE depending on diff status."
   (let ((diff (ztree-diff-node-different node)))
-    (cond ((ztree-diff-node-ignore-p node) ztreep-diff-model-ignored-face)
+    (cond ((eq diff 'ignore) ztreep-diff-model-ignored-face)
           ((eq diff 'diff) ztreep-diff-model-diff-face)
           ((eq diff 'new)  ztreep-diff-model-add-face)
           (t ztreep-diff-model-normal-face))))