[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/dash d7174ed 160/426: Handle cons-cells properly in -fl
From: |
Phillip Lord |
Subject: |
[elpa] externals/dash d7174ed 160/426: Handle cons-cells properly in -flatten |
Date: |
Tue, 04 Aug 2015 19:37:24 +0000 |
branch: externals/dash
commit d7174ed63a874112d96100d4d0a4ac41dfeff5c1
Author: Magnar Sveen <address@hidden>
Commit: Magnar Sveen <address@hidden>
Handle cons-cells properly in -flatten
Fixes #21
---
dash.el | 2 +-
dev/examples.el | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dash.el b/dash.el
index 7f4c281..6ca2fea 100644
--- a/dash.el
+++ b/dash.el
@@ -201,7 +201,7 @@ through the REP function."
(defun -flatten (l)
"Takes a nested list L and returns its contents as a single, flat list."
- (if (listp l)
+ (if (and (listp l) (listp (cdr l)))
(-mapcat '-flatten l)
(list l)))
diff --git a/dev/examples.el b/dev/examples.el
index 40a1ed3..caa7f5c 100644
--- a/dev/examples.el
+++ b/dev/examples.el
@@ -59,7 +59,8 @@
(defexamples -flatten
(-flatten '((1))) => '(1)
- (-flatten '((1 (2 3) (((4 (5))))))) => '(1 2 3 4 5))
+ (-flatten '((1 (2 3) (((4 (5))))))) => '(1 2 3 4 5)
+ (-flatten '(1 2 (3 . 4))) => '(1 2 (3 . 4)))
(defexamples -concat
(-concat '(1)) => '(1)
- [elpa] externals/dash 0731333 140/426: Add @vemv to list of contributors, (continued)
- [elpa] externals/dash 0731333 140/426: Add @vemv to list of contributors, Phillip Lord, 2015/08/04
- [elpa] externals/dash a7ee06e 149/426: Remove extra --separate definition, Phillip Lord, 2015/08/04
- [elpa] externals/dash 3f604cd 151/426: Add -count, Phillip Lord, 2015/08/04
- [elpa] externals/dash fb75a7f 146/426: Add @nicferrier to list of contributors., Phillip Lord, 2015/08/04
- [elpa] externals/dash cc33c2f 153/426: Stop integration tests for Emacs 23, Phillip Lord, 2015/08/04
- [elpa] externals/dash adfafcb 152/426: Add -partition-by-header, Phillip Lord, 2015/08/04
- [elpa] externals/dash 0351ca3 156/426: Add Wilfred Hughes to list of contributors., Phillip Lord, 2015/08/04
- [elpa] externals/dash a4b70f9 154/426: [magnars/dash.el#18] implementing -slice, Phillip Lord, 2015/08/04
- [elpa] externals/dash bd942e1 158/426: inhibit dev from being added to the load-path, Phillip Lord, 2015/08/04
- [elpa] externals/dash c218e9f 150/426: -split-at/with now makes just one pass over list, Phillip Lord, 2015/08/04
- [elpa] externals/dash d7174ed 160/426: Handle cons-cells properly in -flatten,
Phillip Lord <=
- [elpa] externals/dash a559a80 161/426: Added -last, Phillip Lord, 2015/08/04
- [elpa] externals/dash f7a828f 147/426: Add -zip and -zip-with, Phillip Lord, 2015/08/04
- [elpa] externals/dash dac28b0 155/426: Merge pull request #19 from Wilfred/master, Phillip Lord, 2015/08/04
- [elpa] externals/dash a40fc00 162/426: Merge pull request #23 from Fuco1/last, Phillip Lord, 2015/08/04
- [elpa] externals/dash a1b04d8 163/426: Less implementation specific docs for -mapcat, Phillip Lord, 2015/08/04
- [elpa] externals/dash 6ffdc93 157/426: Release 1.1.0, Phillip Lord, 2015/08/04
- [elpa] externals/dash 1396102 165/426: Add -when-let and -if-let macros, Phillip Lord, 2015/08/04
- [elpa] externals/dash 6420bf8 167/426: Add Emanuel Evans to list of contributors, Phillip Lord, 2015/08/04
- [elpa] externals/dash 9371ce4 164/426: Don't use the word collection when meaning list, Phillip Lord, 2015/08/04
- [elpa] externals/dash 30ac13b 168/426: Add -insert-at (closes #27), Phillip Lord, 2015/08/04