[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 87c9714 5/7: Merge pull request #43 from dvzubarev/tramp-f
From: |
Alexey Veretennikov |
Subject: |
[elpa] master 87c9714 5/7: Merge pull request #43 from dvzubarev/tramp-fix |
Date: |
Thu, 5 Jan 2017 10:12:06 +0000 (UTC) |
branch: master
commit 87c97145c7abb0670b36362e16aed68b3f4e28fd
Merge: e1009bb 9aae752
Author: Alexey Veretennikov <address@hidden>
Commit: GitHub <address@hidden>
Merge pull request #43 from dvzubarev/tramp-fix
Fix TRAMP regression
---
ztree-diff-model.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ztree-diff-model.el b/ztree-diff-model.el
index 1f78d62..c8dbeb2 100644
--- a/ztree-diff-model.el
+++ b/ztree-diff-model.el
@@ -146,8 +146,8 @@ Returns t if equal."
(let* ((file1-untrampified (ztree-untrampify-filename file1))
(file2-untrampified (ztree-untrampify-filename file2)))
(if (or
- (/= (nth 7 (file-attributes file1-untrampified))
- (nth 7 (file-attributes file2-untrampified)))
+ (/= (nth 7 (file-attributes file1))
+ (nth 7 (file-attributes file2)))
(/= 0 (process-file diff-command nil nil nil "-q"
file1-untrampified
file2-untrampified)))
- [elpa] master updated (4f9c5f4 -> 4e0df28), Alexey Veretennikov, 2017/01/05
- [elpa] master 87c9714 5/7: Merge pull request #43 from dvzubarev/tramp-fix,
Alexey Veretennikov <=
- [elpa] master 9aae752 4/7: Fix TRAMP regression, Alexey Veretennikov, 2017/01/05
- [elpa] master 3a4df17 6/7: Updated docstrings and bumped version, Alexey Veretennikov, 2017/01/05
- [elpa] master e1009bb 3/7: Issue #42: Added support for narrow/widen in ztree-dir., Alexey Veretennikov, 2017/01/05
- [elpa] master 4e0df28 7/7: 1) Implemented feature: narrow/widen directories in ztree-dir, Alexey Veretennikov, 2017/01/05
- [elpa] master dc4df88 1/7: Fix about cl-lib, Alexey Veretennikov, 2017/01/05
- [elpa] master 497605f 2/7: Merge pull request #41 from syohex/cl-lib, Alexey Veretennikov, 2017/01/05