branch: elpa/clojure-mode
commit 2c6e578953d9b6308b9682fa46ed680548fc74b4
Author: Bozhidar Batsov <[email protected]>
Commit: Bozhidar Batsov <[email protected]>

    Bump minimum Emacs version to 27.1
    
    Remove Emacs 26 from the CI build matrix, update Package-Requires, and
    replace the ignore-errors/down-list workaround with
    ppss-comment-or-string-start (available since Emacs 27).
---
 .circleci/config.yml | 10 ----------
 CHANGELOG.md         |  4 ++++
 clojure-mode.el      |  8 ++------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7d91616f60..4163dc4656 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -51,15 +51,6 @@ commands:
           command: eldev -dtT compile --warnings-as-errors
 
 jobs:
-  test-ubuntu-emacs-26:
-    docker:
-      - image: silex/emacs:26-ci
-        entrypoint: bash
-    steps:
-      - setup
-      - test
-      - lint
-      - compile
   test-ubuntu-emacs-27:
     docker:
       - image: silex/emacs:27-ci
@@ -129,7 +120,6 @@ workflows:
   version: 2.1
   ci-test-matrix:
     jobs:
-      - test-ubuntu-emacs-26
       - test-ubuntu-emacs-27
       - test-ubuntu-emacs-28
       - test-ubuntu-emacs-29
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51077f9e3f..76e20b9c5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## master (unreleased)
 
+### Changes
+
+* Bump the minimum required Emacs version to 27.1.
+
 ## 5.20.0 (2025-05-27)
 
 ### New features
diff --git a/clojure-mode.el b/clojure-mode.el
index c3d950ce1a..77d1c589ec 100644
--- a/clojure-mode.el
+++ b/clojure-mode.el
@@ -13,7 +13,7 @@
 ;; URL: https://github.com/clojure-emacs/clojure-mode
 ;; Keywords: languages clojure clojurescript lisp
 ;; Version: 5.20.0
-;; Package-Requires: ((emacs "25.1"))
+;; Package-Requires: ((emacs "27.1"))
 
 ;; This file is not part of GNU Emacs.
 
@@ -831,11 +831,7 @@ Called by `imenu--generic-function'."
       (let (found?
             (deftype (match-string 2))
             (start (point)))
-        ;; ignore user-error from down-list when called from inside a string 
or comment
-        ;; TODO: a better workaround would be to wrap it in
-        ;; unless (ppss-comment-or-string-start (syntax-ppss)) instead of 
ignore-errors,
-        ;; but ppss-comment-or-string-start is only available since Emacs 27
-        (ignore-errors
+        (unless (ppss-comment-or-string-start (syntax-ppss))
           (down-list))
         (forward-sexp)
         (while (not found?)

Reply via email to