From 5979f16e974ca9989ed4aaddc29036ddb90328d4 Mon Sep 17 00:00:00 2001 From: p4v4n Date: Tue, 9 Jun 2026 21:22:50 +0530 Subject: [PATCH 1/2] Add workaround for upstream Eldev issue - https://github.com/emacs-eldev/eldev/issues/120 --- Eldev | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Eldev b/Eldev index 3239c2a6..95314d17 100644 --- a/Eldev +++ b/Eldev @@ -1,6 +1,7 @@ ; -*- mode: emacs-lisp; lexical-binding: t -*- -(eldev-require-version "1.6") +(require 'bytecomp) +(eldev-require-version "1.11.1") (eldev-use-package-archive 'gnu-elpa) (eldev-use-package-archive 'nongnu-elpa) From 1b24f8ad4ceabb968c0defbfaa7ce029e0202a25 Mon Sep 17 00:00:00 2001 From: p4v4n Date: Tue, 9 Jun 2026 21:25:48 +0530 Subject: [PATCH 2/2] Fix compilation warnings in Emacs 31+ - Quote obsolete font-lock face variables: 'font-lock-doc-face, 'font-lock-string-face, 'font-lock-comment-face - Replace obsolete macros with if-let* / when-let*. --- clojure-mode.el | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/clojure-mode.el b/clojure-mode.el index 51f8a5f2..fc76dc35 100644 --- a/clojure-mode.el +++ b/clojure-mode.el @@ -83,7 +83,7 @@ :link '(url-link :tag "GitHub" "https://github.com/clojure-emacs/clojure-mode") :link '(emacs-commentary-link :tag "Commentary" "clojure-mode")) -(defconst clojure-mode-version "5.22.0" +(defconst clojure-mode-version "5.23.0" "The current version of `clojure-mode'.") (defface clojure-keyword-face @@ -1293,9 +1293,9 @@ highlighted region)." (and parent-beg (goto-char parent-beg) (looking-at "([ \t\n]*defprotocol\\>")))))) - font-lock-doc-face - font-lock-string-face)) - font-lock-comment-face)) + 'font-lock-doc-face + 'font-lock-string-face)) + 'font-lock-comment-face)) (defun clojure-font-lock-setup () "Configures font-lock for editing Clojure code." @@ -2720,11 +2720,11 @@ many times." (beginning-of-defun-raw) (forward-char 1) ;; skip paren so we start at comment (clojure-forward-logical-sexp) ;; skip past the comment form itself - (if-let ((sexp-start (seq-find - (lambda (beg-pos) - (< beg-pos original-position)) - (clojure-sexp-starts-until-position - clojure-comment-end)))) + (if-let* ((sexp-start (seq-find + (lambda (beg-pos) + (< beg-pos original-position)) + (clojure-sexp-starts-until-position + clojure-comment-end)))) (progn (goto-char sexp-start) t) (beginning-of-defun-raw n)))) (scan-error (beginning-of-defun-raw n))) @@ -3372,7 +3372,7 @@ END marks the end of the fn expression" (defun clojure-promote-fn-literal () "Convert a #(...) function into (fn [...] ...), prompting for the argument names." (interactive) - (when-let (beg (clojure-string-start)) + (when-let* ((beg (clojure-string-start))) (goto-char beg)) (if (or (looking-at-p "#(") (ignore-errors (forward-char 1))