[elpa] master cefecf1 77/92: Merge pull request #9 from Silex/master

[Alexey Veretennikov]

branch: master
commit cefecf1aaa66fad5541c449a2d28dc1f83da7237
Merge: 2dd7c7b 364eced
Author: Alexey Veretennikov <address@hidden>
Commit: Alexey Veretennikov <address@hidden>

    Merge pull request #9 from Silex/master
    
    Make it work over TRAMP
---
 ztree-diff-model.el |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ztree-diff-model.el b/ztree-diff-model.el
index c915d90..d2dfd1f 100644
--- a/ztree-diff-model.el
+++ b/ztree-diff-model.el
@@ -105,12 +105,21 @@
        (string-equal (ztree-diff-node-right-path node1)
                      (ztree-diff-node-right-path node1))))
 
+(defun ztree-diff-untrampify-filename (file)
+  "Returns `file' as the local file name."
+  (require 'tramp)
+  (if (not (tramp-tramp-file-p file))
+      file
+    (tramp-file-name-localname (tramp-dissect-file-name file))))
+
 (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))))
+  (let* ((file1-untrampified (ztree-diff-untrampify-filename file1))
+         (file2-untrampified (ztree-diff-untrampify-filename file2))
+         (diff-command (concat "diff -q" " " file1-untrampified " " 
file2-untrampified))
+         (diff-output (shell-command-to-string diff-command)))
     (not (> (length diff-output) 2))))
 
-
 (defun ztree-directory-files (dir)
   "Returns the list of full paths of files in a directory, filtering out . and 
.."
   (ztree-filter #'(lambda (file) (let ((simple-name (file-short-name file)))