From 9633bf893aa83992b69c57e8484ef4a987df4baf Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 25 Sep 2019 21:59:36 +0800 Subject: [PATCH 1/4] enh: Indentation. --- emacsql-sqlite3-test.el | 4 ++-- emacsql-sqlite3.el | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/emacsql-sqlite3-test.el b/emacsql-sqlite3-test.el index 679e092..a6172d4 100644 --- a/emacsql-sqlite3-test.el +++ b/emacsql-sqlite3-test.el @@ -84,8 +84,8 @@ (cl-letf* ((proc (emacsql-process conn)) (retsym (make-symbol "retsym")) ((process-filter proc) - (lambda (_proc string) - (throw retsym string)))) + (lambda (_proc string) + (throw retsym string)))) (catch retsym (apply #'emacsql-sqlite3-run-dot-command conn cmd args) (accept-process-output proc emacsql-tests-timeout)))) diff --git a/emacsql-sqlite3.el b/emacsql-sqlite3.el index de18559..4cac724 100644 --- a/emacsql-sqlite3.el +++ b/emacsql-sqlite3.el @@ -177,14 +177,13 @@ each arg will be quoted first." (if (looking-at (rx "Error: " (group (1+ char)) eol)) (signal 'emacsql-error (list (match-string 1))) (cl-macrolet ((sexps-in-line! () - `(cl-loop - until (looking-at "\n") - collect (read (current-buffer))))) + `(cl-loop until (looking-at "\n") + collect (read (current-buffer))))) (cl-loop - until (looking-at - (concat (regexp-quote emacsql-sqlite3--cmd-end-mark) "\n")) - collect (sexps-in-line!) - do (forward-char)))))) + until (looking-at + (concat (regexp-quote emacsql-sqlite3--cmd-end-mark) "\n")) + collect (sexps-in-line!) + do (forward-char)))))) (cl-defmethod emacsql-close ((conn emacsql-sqlite3-connection)) (let ((process (emacsql-process conn))) From bb68cca4706afcd3b501dddcad913c5c802a334d Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 25 Sep 2019 21:59:46 +0800 Subject: [PATCH 2/4] enh(test): Work around for ert-runner's bug. --- emacsql-sqlite3-test.el | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/emacsql-sqlite3-test.el b/emacsql-sqlite3-test.el index a6172d4..ba56552 100644 --- a/emacsql-sqlite3-test.el +++ b/emacsql-sqlite3-test.el @@ -5,6 +5,12 @@ (require 'emacsql) (require 'emacsql-sqlite3) +;; Workaround for known bug of ert-runner +;; https://github.com/rejeep/ert-runner.el/issues/49 +(eval-and-compile + (unless (fboundp 'ert--print-backtrace) + (defalias 'ert--print-backtrace #'backtrace-to-string))) + (defvar emacsql-tests-timeout 4 "Be aggressive about not waiting on subprocesses in unit tests.") From 80f2b8c33547143276cb35598cedc1145681b794 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 25 Sep 2019 22:00:38 +0800 Subject: [PATCH 3/4] new: Test on emacs 25.1 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b9a4d1c..c2481ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: emacs-lisp env: + - EVM_EMACS=emacs-25.1-travis - EVM_EMACS=emacs-26.1-travis - EVM_EMACS=emacs-git-snapshot-travis From e960e6c126a2e0b5651afc15ff7d8f8315662d51 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 25 Sep 2019 22:42:05 +0800 Subject: [PATCH 4/4] fixup 25.2 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c2481ef..335a21c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: emacs-lisp env: - EVM_EMACS=emacs-25.1-travis + - EVM_EMACS=emacs-25.2-travis - EVM_EMACS=emacs-26.1-travis - EVM_EMACS=emacs-git-snapshot-travis