[elpa] master 2751b96 1/2: Issue #40: Use process-file instead of shell-command-to-string

[Alexey Veretennikov]

branch: master
commit 2751b96aca36cc5c31dc105ec985c269126420a0
Author: Alexey Veretennikov 
Commit: Alexey Veretennikov 

Issue #40: Use process-file instead of shell-command-to-string
---
 ztree-diff-model.el |   14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/ztree-diff-model.el b/ztree-diff-model.el
index 617f8b8..1f78d62 100644
--- a/ztree-diff-model.el
+++ b/ztree-diff-model.el
@@ -144,15 +144,13 @@ Returns t if equal."
   (unless (ztree-same-host-p file1 file2)
 (error "Compared files are not on the same host"))
   (let* ((file1-untrampified (ztree-untrampify-filename file1))
- (file2-untrampified (ztree-untrampify-filename file2))
- (diff-cmd (concat diff-command " -q" " "
-   (ztree-quotify-string file1-untrampified)
-   " "
-   (ztree-quotify-string file2-untrampified
-(if (and 
- (= (nth 7 (file-attributes file1-untrampified))
+ (file2-untrampified (ztree-untrampify-filename file2)))
+(if (or 
+ (/= (nth 7 (file-attributes file1-untrampified))
 (nth 7 (file-attributes file2-untrampified)))
- (> (length (shell-command-to-string diff-cmd)) 2))
+ (/= 0 (process-file diff-command nil nil nil "-q"
+   file1-untrampified
+   file2-untrampified)))
 'diff
   'same)))
 

[elpa] master 71ad60d 2/2: Merge commit '2751b96aca36cc5c31dc105ec985c269126420a0'

[Alexey Veretennikov]

branch: master
commit 71ad60d9959a10332dc4ac149c8a8dc7a7d35273
Merge: 8650a52 2751b96
Author: Alexey Veretennikov 
Commit: Alexey Veretennikov 

Merge commit '2751b96aca36cc5c31dc105ec985c269126420a0'
---
 packages/ztree/ztree-diff-model.el |   14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/ztree/ztree-diff-model.el 
b/packages/ztree/ztree-diff-model.el
index 617f8b8..1f78d62 100644
--- a/packages/ztree/ztree-diff-model.el
+++ b/packages/ztree/ztree-diff-model.el
@@ -144,15 +144,13 @@ Returns t if equal."
   (unless (ztree-same-host-p file1 file2)
 (error "Compared files are not on the same host"))
   (let* ((file1-untrampified (ztree-untrampify-filename file1))
- (file2-untrampified (ztree-untrampify-filename file2))
- (diff-cmd (concat diff-command " -q" " "
-   (ztree-quotify-string file1-untrampified)
-   " "
-   (ztree-quotify-string file2-untrampified
-(if (and 
- (= (nth 7 (file-attributes file1-untrampified))
+ (file2-untrampified (ztree-untrampify-filename file2)))
+(if (or 
+ (/= (nth 7 (file-attributes file1-untrampified))
 (nth 7 (file-attributes file2-untrampified)))
- (> (length (shell-command-to-string diff-cmd)) 2))
+ (/= 0 (process-file diff-command nil nil nil "-q"
+   file1-untrampified
+   file2-untrampified)))
 'diff
   'same)))
 

[elpa] master 18b6414: Use regexp-opt on suffixes in el-search--elisp-file-name-p

[Michael Heerdegen]

branch: master
commit 18b6414d3e40c91f15ee8b3bfecfe7f660267a21
Author: Michael Heerdegen 
Commit: Michael Heerdegen 

Use regexp-opt on suffixes in el-search--elisp-file-name-p
---
 packages/el-search/el-search.el |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el
index e2cbfaa..c7812a7 100644
--- a/packages/el-search/el-search.el
+++ b/packages/el-search/el-search.el
@@ -827,10 +827,7 @@ MESSAGE are used to construct the error message."
  type arg
 
 (defun el-search--elisp-file-name-p (file)
-  (and (string-match-p (concat "\\.el\\("
-   (mapconcat #'identity jka-compr-load-suffixes 
"\\|")
-   "\\)?\\'")
-   file)
+  (and (string-match-p (concat "\\.el" (regexp-opt jka-compr-load-suffixes) 
"?\\'") file)
(file-exists-p file)
(not (file-directory-p file
 

[elpa] master c09eca2: Change to package directory before checking .elpaignore exclusions.

[Jackson Ray Hamilton]

branch: master
commit c09eca2536cf0ccdbc202a17b2027bff7b8f788f
Author: Jackson Ray Hamilton 
Commit: Jackson Ray Hamilton 

Change to package directory before checking .elpaignore exclusions.

If we don't do this, the package's directory's name is included in the file
names that are checked for .elpaignore matches.  .elpaignore matches should 
be
assumed to occur inside the package's directory.
---
 GNUmakefile |   15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 6d57fae..8edb2f8 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -150,13 +150,18 @@ $(foreach al, $(autoloads), $(eval $(call RULE-srcdeps, 
$(al
 included_els := $(shell \
   for pt in packages/*; do \
   if [ -d $$pt ]; then \
-  if [ -f "$${pt}/.elpaignore" ]; then \
-  tar -ch $$pt/*.el --no-recursion \
-  --exclude-vcs -X "$${pt}/.elpaignore"\
+  prev=$$(pwd);\
+  cd $$pt; \
+  if [ -f .elpaignore ]; then  \
+  tar -ch *.el --no-recursion  \
+  --exclude-vcs -X .elpaignore \
 | tar --list;  \
   else \
-  ls -1 $$pt/*.el; \
-  fi;  \
+  ls -1 *.el;  \
+  fi | while read line;\
+   do echo "$${pt}/$${line}";  \
+   done;   \
+  cd $$prev;   \
   fi;  \
   done)
 els := $(call FILTER-nonsrc, $(included_els))