Skip to content

Fix compilation warnings in Emacs 31+ #703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
p4v4n wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix compilation warnings in Emacs 31+ #703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5979f16
Add workaround for upstream Eldev issue
p4v4n Jun 9, 2026
1b24f8a
Fix compilation warnings in Emacs 31+
p4v4n Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Eldev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
20 changes: 10 additions & 10 deletions clojure-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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."
Expand Down Expand Up @@ -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)))
Expand Down Expand Up @@ -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))
Expand Down
Loading