summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonrad Hinsen <konrad.hinsen@fastmail.net>2010-05-27 17:48:04 +0200
committerStuart Halloway <stu@thinkrelevance.com>2010-06-03 21:26:20 -0400
commit673f4c70a82b6af9379aa7b7e8188c8b809fed51 (patch)
tree2b3583d5890032e4b43f3758e9332f8ad236841b
parentfde4f64bb5eb5c87b618b37e3d69ac37f1531524 (diff)
Improve merge-with to work with map-like types that don't implement clojure.lang.IFn for lookup
Signed-off-by: Stuart Halloway <stu@thinkrelevance.com>
-rw-r--r--src/clj/clojure/core.clj2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/clj/clojure/core.clj b/src/clj/clojure/core.clj
index 2abed3dd..11800ead 100644
--- a/src/clj/clojure/core.clj
+++ b/src/clj/clojure/core.clj
@@ -2273,7 +2273,7 @@
(let [merge-entry (fn [m e]
(let [k (key e) v (val e)]
(if (contains? m k)
- (assoc m k (f (m k) v))
+ (assoc m k (f (get m k) v))
(assoc m k v))))
merge2 (fn [m1 m2]
(reduce merge-entry (or m1 {}) (seq m2)))]