[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 32db847 78/92: Fixed files with spaces comparison error
From: |
Alexey Veretennikov |
Subject: |
[elpa] master 32db847 78/92: Fixed files with spaces comparison error |
Date: |
Thu, 11 Jun 2015 19:48:18 +0000 |
branch: master
commit 32db847e4545483bdb08d6facdb8bb9887fb6d6d
Author: Alexey Veretennikov <address@hidden>
Commit: Alexey Veretennikov <address@hidden>
Fixed files with spaces comparison error
---
ztree-diff-model.el | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ztree-diff-model.el b/ztree-diff-model.el
index d2dfd1f..a7153fc 100644
--- a/ztree-diff-model.el
+++ b/ztree-diff-model.el
@@ -112,10 +112,13 @@
file
(tramp-file-name-localname (tramp-dissect-file-name file))))
+(defun ztree-diff-modef-quotify-string (x)
+ (concat "\"" x "\""))
+
(defun ztree-diff-model-files-equal (file1 file2)
"Compare files using external diff. Returns t if equal"
- (let* ((file1-untrampified (ztree-diff-untrampify-filename file1))
- (file2-untrampified (ztree-diff-untrampify-filename file2))
+ (let* ((file1-untrampified (ztree-diff-untrampify-filename
(ztree-diff-modef-quotify-string file1)))
+ (file2-untrampified (ztree-diff-untrampify-filename
(ztree-diff-modef-quotify-string file2)))
(diff-command (concat "diff -q" " " file1-untrampified " "
file2-untrampified))
(diff-output (shell-command-to-string diff-command)))
(not (> (length diff-output) 2))))
- [elpa] master 635eb9a 67/92: Merge pull request #4 from yasuyk/patch-3, (continued)
- [elpa] master 635eb9a 67/92: Merge pull request #4 from yasuyk/patch-3, Alexey Veretennikov, 2015/06/11
- [elpa] master b772a0c 71/92: Merge branch 'master' of github.com:fourier/ztree, Alexey Veretennikov, 2015/06/11
- [elpa] master 557024f 72/92: Merge pull request #6 from jpkotta/master, Alexey Veretennikov, 2015/06/11
- [elpa] master fa043b6 70/92: Fixed issue #5 with electric-indent-mode by turning it off, Alexey Veretennikov, 2015/06/11
- [elpa] master 4086298 68/92: add ztree-find-file as the action for ztree-dir, Alexey Veretennikov, 2015/06/11
- [elpa] master d44da81 69/92: Fixed issue #1 with electric-indent-mode by turning it off, Alexey Veretennikov, 2015/06/11
- [elpa] master 111afc6 73/92: Issue #8: Added hotkey 'x' to toggle between expanded/collapsed state of the current directory and its children, Alexey Veretennikov, 2015/06/11
- [elpa] master 2dd7c7b 75/92: Fixed vertical line for separator - now it is not rounded, Alexey Veretennikov, 2015/06/11
- [elpa] master f037979 74/92: Added rounding at the end of vertical line, Alexey Veretennikov, 2015/06/11
- [elpa] master 364eced 76/92: Make it work over TRAMP, Alexey Veretennikov, 2015/06/11
- [elpa] master 32db847 78/92: Fixed files with spaces comparison error,
Alexey Veretennikov <=
- [elpa] master cefecf1 77/92: Merge pull request #9 from Silex/master, Alexey Veretennikov, 2015/06/11
- [elpa] master 9b1f994 79/92: Fixed tree offset on the right side, Alexey Veretennikov, 2015/06/11
- [elpa] master b217776 80/92: Added reference to zdircmp, Alexey Veretennikov, 2015/06/11
- [elpa] master 7156104 81/92: Updated ztree-diff-filter-list, Alexey Veretennikov, 2015/06/11
- [elpa] master c7a05e8 83/92: Merge pull request #16 from syohex/fix-declarations, Alexey Veretennikov, 2015/06/11
- [elpa] master 39854cd 82/92: Fix variable declarations, Alexey Veretennikov, 2015/06/11
- [elpa] master 22c97ab 87/92: Updated readme with info about ELPA, Alexey Veretennikov, 2015/06/11
- [elpa] master ffd97be 89/92: Preparation for GNU ELPA, Alexey Veretennikov, 2015/06/11
- [elpa] master 1dbb290 92/92: Merge remote-tracking branch 'ztree/master', Alexey Veretennikov, 2015/06/11
- [elpa] master f4e5784 86/92: Updated copyright, Alexey Veretennikov, 2015/06/11