[nongnu] elpa/parseedn 3b1bea1425 27/32: Drop use of map-merge alist, for Emacs 25/26

[ELPA Syncer]

branch: elpa/parseedn
commit 3b1bea14257fe2acd067b6644e0d916cfaa806ba
Author: Arne Brasseur <arne@arnebrasseur.net>
Commit: Arne Brasseur <arne@arnebrasseur.net>

    Drop use of map-merge alist, for Emacs 25/26
---
 CHANGELOG.md | 4 ++++
 parseedn.el  | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 746581aff2..2f8bb3fc4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Unreleased
 
+## 1.0.4 (2021-09-30)
+
+- Drop use of (map-merge 'alist) for older Emacsen
+
 ## 1.0.3 (2021-09-29)
 
 - Follow upstream parseclj versioning
diff --git a/parseedn.el b/parseedn.el
index adc9c65e17..14a8d7c3e8 100644
--- a/parseedn.el
+++ b/parseedn.el
@@ -4,8 +4,8 @@
 
 ;; Author: Arne Brasseur <arne@arnebrasseur.net>
 ;; Keywords: lisp clojure edn parser
-;; Package-Requires: ((emacs "25") (parseclj "1.0.3") (map "2"))
-;; Version: 1.0.3
+;; Package-Requires: ((emacs "25") (parseclj "1.0.4") (map "2"))
+;; Version: 1.0.4
 
 ;; This file is not part of GNU Emacs.
 
@@ -84,7 +84,7 @@ CHILDREN is a collection elisp values to be reduced into an 
elisp
 sequence.
 OPTIONS is an association list.  See `parseclj-parse' for more information
 on available options."
-  (let ((tag-readers (map-merge 'alist parseedn-default-tag-readers (alist-get 
:tag-readers options)))
+  (let ((tag-readers (parseclj-alist-merge parseedn-default-tag-readers 
(alist-get :tag-readers options)))
         (token-type (parseclj-lex-token-type opening-token)))
     (if (eq token-type :discard)
         stack