Skip to content

Commit 3b1bea1

Browse files
committed
Drop use of map-merge alist, for Emacs 25/26
1 parent edfee3a commit 3b1bea1

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Unreleased
22

3+
## 1.0.4 (2021-09-30)
4+
5+
- Drop use of (map-merge 'alist) for older Emacsen
6+
37
## 1.0.3 (2021-09-29)
48

59
- Follow upstream parseclj versioning

parseedn.el

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
;; Author: Arne Brasseur <[email protected]>
66
;; Keywords: lisp clojure edn parser
7-
;; Package-Requires: ((emacs "25") (parseclj "1.0.3") (map "2"))
8-
;; Version: 1.0.3
7+
;; Package-Requires: ((emacs "25") (parseclj "1.0.4") (map "2"))
8+
;; Version: 1.0.4
99

1010
;; This file is not part of GNU Emacs.
1111

@@ -84,7 +84,7 @@ CHILDREN is a collection elisp values to be reduced into an elisp
8484
sequence.
8585
OPTIONS is an association list. See `parseclj-parse' for more information
8686
on available options."
87-
(let ((tag-readers (map-merge 'alist parseedn-default-tag-readers (alist-get :tag-readers options)))
87+
(let ((tag-readers (parseclj-alist-merge parseedn-default-tag-readers (alist-get :tag-readers options)))
8888
(token-type (parseclj-lex-token-type opening-token)))
8989
(if (eq token-type :discard)
9090
stack

0 commit comments

Comments
 (0)