diff --git a/.circleci/config.yml b/.circleci/config.yml index 6527b13..f03a87f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -51,14 +51,6 @@ commands: command: eldev -dtT compile --warnings-as-errors jobs: - test-ubuntu-emacs-27: - docker: - - image: silex/emacs:27-ci - entrypoint: bash - steps: - - setup - - test - test-ubuntu-emacs-28: docker: - image: silex/emacs:28-ci @@ -119,7 +111,6 @@ workflows: version: 2 ci-test-matrix: jobs: - - test-ubuntu-emacs-27 - test-ubuntu-emacs-28 - test-ubuntu-emacs-29 - test-ubuntu-emacs-30 diff --git a/inf-clojure.el b/inf-clojure.el index 77336a2..9122371 100644 --- a/inf-clojure.el +++ b/inf-clojure.el @@ -8,7 +8,7 @@ ;; URL: http://github.com/clojure-emacs/inf-clojure ;; Keywords: processes, comint, clojure ;; Version: 3.3.0-snapshot -;; Package-Requires: ((emacs "27.1") (clojure-mode "5.11")) +;; Package-Requires: ((emacs "28.1") (clojure-mode "5.11")) ;; This file is not part of GNU Emacs. @@ -1004,12 +1004,16 @@ of forms." (while (not (eobp)) (while (looking-at "\n") (delete-char 1)) + ;; NOTE: There is no special API for that in + ;; `clojure-ts-mode', so probably for now lets keep this + ;; `clojure-mode' function. (unless (eobp) - ;; NOTE: There is no special API for that in - ;; `clojure-ts-mode', so probably for now lets keep this - ;; `clojure-mode' function. - (clojure-forward-logical-sexp) - (forward-char))) + (clojure-forward-logical-sexp)) + (unless (eobp) + (forward-char) + ;; Remove an empty line at the end of the buffer. + (when (eobp) + (delete-char -1)))) (buffer-substring-no-properties (point-min) (point-max)))) (scan-error str))) @@ -1503,7 +1507,7 @@ evaluating \\[inf-clojure-completion-form] at the REPL." (funcall inf-clojure-completions-fn (inf-clojure--process-response completion-expr proc "(" ")")))))) -(defconst inf-clojure-clojure-expr-break-chars "^[] \"'`><,;|&{()[@\\^]" +(defconst inf-clojure-clojure-expr-break-chars "^][ \"'`><,;|&{()@\\^" "Regexp are hard. This regex has been built in order to match the first of the diff --git a/test/inf-clojure-tests.el b/test/inf-clojure-tests.el index 6023338..af6dea9 100644 --- a/test/inf-clojure-tests.el +++ b/test/inf-clojure-tests.el @@ -88,9 +88,8 @@ (ict-with-assess-buffers ((a (insert "@"))) (with-current-buffer a - (expect - (ict-bounds-string (inf-clojure-completion-bounds-of-expr-at-point)) - :not :to-be nil)))) + (expect (inf-clojure-completion-bounds-of-expr-at-point) + :to-be nil)))) (it "computes bounds for [symbol" (ict-with-assess-buffers