Skip to content

Commit 361b2e0

Browse files
grzmbbatsov
authored andcommitted
Update current-local-map during paredit setup to work with edn-mode
Using current-local-map instead of clojure-mode-map allows the edn-mode-map to be updated in edn-mode (and, of course, the clojure-mode-map to be updated in clojure-mode). Using clojure-mode-map directly prevented edn-mode from inheriting the benefits of clojure-paredit-setup, such as auto-pairing curly braces.
1 parent d58686d commit 361b2e0

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## master (unreleased)
44

5+
### Bugs fixed
6+
7+
* Fix `clojure-paredent-setup` to apply to `edn-mode-map` as well as `clojure-mode-map`.
8+
59
## 5.22.0 (2026-03-03)
610

711
### New features

clojure-mode.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -586,14 +586,14 @@ bracket.")
586586
(clojure--replace-sexps-with-bindings-and-indent))))
587587

588588
(defun clojure-paredit-setup (&optional keymap)
589-
"Make \"paredit-mode\" play nice with `clojure-mode'.
589+
"Make \"paredit-mode\" play nice with `clojure-mode and `edn-mode'.
590590
591591
If an optional KEYMAP is passed the changes are applied to it,
592592
instead of to `clojure-mode-map'.
593593
Also advice `paredit-convolute-sexp' when used on a let form as drop in
594594
replacement for `cljr-expand-let`."
595595
(when (>= paredit-version 21)
596-
(let ((keymap (or keymap clojure-mode-map)))
596+
(let ((keymap (or keymap (current-local-map))))
597597
(define-key keymap "{" #'paredit-open-curly)
598598
(define-key keymap "}" #'paredit-close-curly))
599599
(make-local-variable 'paredit-space-for-delimiter-predicates)

0 commit comments

Comments
 (0)