branch: externals/pyim
commit 2d052fd36642c287afa49df477f5fc16eda10d79
Author: Chen Bin <chenbin...@gmail.com>
Commit: Chen Bin <chenbin...@gmail.com>
fixed emacs25 CI
---
pyim-cloudim.el | 2 +-
pyim-cregexp.el | 2 +-
pyim-probe.el | 1 +
tests/Makefile | 20 +++++++++++++-------
4 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/pyim-cloudim.el b/pyim-cloudim.el
index 3e05f723dc..b08c573a45 100644
--- a/pyim-cloudim.el
+++ b/pyim-cloudim.el
@@ -81,7 +81,7 @@
(proc-buffer (url-retrieve url callback nil silent
inhibit-cookies)))
(if (not proc-buffer)
- (url-debug 'retrieval "Synchronous fetching unnecessary %s" url)
+ (url-debug 'retrieval "Synchronous fetching unnecessary %s
url-asynchronous=%s" url url-asynchronous)
(unwind-protect
(catch 'done
(while (and (not (input-pending-p)) ;如果用户继续输入，就停止云搜索。
diff --git a/pyim-cregexp.el b/pyim-cregexp.el
index c43ed445c1..b750a038e1 100644
--- a/pyim-cregexp.el
+++ b/pyim-cregexp.el
@@ -28,7 +28,7 @@
;;; Code:
;; * 代码 :code:
(require 'cl-lib)
-(require 'isearch)
+(when (>= emacs-major-version 26) (require 'isearch))
(require 'xr)
(require 'rx)
(require 'pyim-pymap)
diff --git a/pyim-probe.el b/pyim-probe.el
index e9479c6955..6d6574d14f 100644
--- a/pyim-probe.el
+++ b/pyim-probe.el
@@ -53,6 +53,7 @@
;;; Code:
;; * 代码 :code:
+(when (>= emacs-major-version 26) (require 'isearch))
(require 'pyim-common)
(require 'pyim-process)
diff --git a/tests/Makefile b/tests/Makefile
index 4c7f77248e..f7baab1af4 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -4,8 +4,13 @@ EMACS ?= emacs
.PHONY: test lint clean deps compile
+EMACS_BATCH_OPTS=--batch --quick --directory .. --directory ./deps
+RM=@rm -rf
+
clean:
- @rm -rf "pyim-tests-temp-*" "../*.elc" "*.elc"
+ $(RM) pyim-tests-temp-*
+ $(RM) ../*.elc
+ $(RM) *.elc
deps:
@mkdir -p deps;
@@ -20,12 +25,13 @@ deps:
lint: deps
- @$(EMACS) --batch --quick --directory .. --directory ./deps --load
./pyim-elint.el 2>&1 | grep -vE "pyim-cregexp.el:[0-9]+:Warning: Empty varlist
in let|pyim-indicator.el:[0-9]+:Error: Call to undefined function:
posframe-show" | grep -E "([Ee]rror|[Ww]arning):" && exit 1 || exit 0
+ @$(EMACS) $(EMACS_BATCH_OPTS) --load ./pyim-elint.el 2>&1 | grep -vE
"pyim-cregexp.el:[0-9]+:Warning: Empty varlist in
let|pyim-indicator.el:[0-9]+:Error: Call to undefined function: posframe-show"
| grep -E "([Ee]rror|[Ww]arning):" && exit 1 || exit 0
-compile: deps clean
- @$(EMACS) --batch --quick --directory .. --directory ./deps --load
./pyim-byte-compile.el 2>&1 | grep -E "([Ee]rror|[Ww]arning):" && exit 1 ||
exit 0
+compile: deps
+ $(RM) ../*.elc
+ @$(EMACS) $(EMACS_BATCH_OPTS) --load ./pyim-byte-compile.el 2>&1 | grep
-E "([Ee]rror|[Ww]arning):" && exit 1 || exit 0
# test: lint compile deps clean
-test: deps clean compile
- @$(EMACS) --batch --quick --directory .. --directory ./deps --load
./pyim-tests.el
- @rm -rf "pyim-tests-temp-*"
+test: compile deps
+ @$(EMACS) $(EMACS_BATCH_OPTS) --load ./pyim-tests.el
+ $(RM) pyim-tests-temp-*
