[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/dash afe2781 388/439: Merge pull request #109 from bbat
From: |
Phillip Lord |
Subject: |
[elpa] externals/dash afe2781 388/439: Merge pull request #109 from bbatsov/threading-indentation |
Date: |
Tue, 04 Aug 2015 20:31:01 +0000 |
branch: externals/dash
commit afe27810c48e978717268bc687c56cc397c3c858
Merge: 5f879b3 9642c4a
Author: Magnar Sveen <address@hidden>
Commit: Magnar Sveen <address@hidden>
Merge pull request #109 from bbatsov/threading-indentation
[Fix #108] Sync indentation of threading forms with Clojure
---
dash.el | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/dash.el b/dash.el
index d0fc30c..60596f4 100644
--- a/dash.el
+++ b/dash.el
@@ -1090,10 +1090,6 @@ in second form, etc."
(list form x))
`(--> (--> ,x ,form) ,@more)))
-(put '-> 'lisp-indent-function 1)
-(put '->> 'lisp-indent-function 1)
-(put '--> 'lisp-indent-function 1)
-
(defun -grade-up (comparator list)
"Grade elements of LIST using COMPARATOR relation, yielding a
permutation vector such that applying this permutation to LIST
@@ -1101,8 +1097,8 @@ sorts it in ascending order."
;; ugly hack to "fix" lack of lexical scope
(let ((comp `(lambda (it other) (funcall ',comparator (car it) (car
other)))))
(->> (--map-indexed (cons it it-index) list)
- (-sort comp)
- (-map 'cdr))))
+ (-sort comp)
+ (-map 'cdr))))
(defun -grade-down (comparator list)
"Grade elements of LIST using COMPARATOR relation, yielding a
@@ -1111,8 +1107,8 @@ sorts it in descending order."
;; ugly hack to "fix" lack of lexical scope
(let ((comp `(lambda (it other) (funcall ',comparator (car other) (car
it)))))
(->> (--map-indexed (cons it it-index) list)
- (-sort comp)
- (-map 'cdr))))
+ (-sort comp)
+ (-map 'cdr))))
(defun dash--match-ignore-place-p (symbol)
"Return non-nil if SYMBOL is a symbol and starts with _."
@@ -1500,13 +1496,13 @@ Note: binding is done according to `-let*'."
(declare (debug ((&rest (sexp form)) form body))
(indent 2))
(->> vars-vals
- (--mapcat (dash--match (car it) (cadr it)))
- (--reduce-r-from
- (let ((var (car it))
- (val (cadr it)))
- `(let ((,var ,val))
- (if ,var ,acc ,@else)))
- then)))
+ (--mapcat (dash--match (car it) (cadr it)))
+ (--reduce-r-from
+ (let ((var (car it))
+ (val (cadr it)))
+ `(let ((,var ,val))
+ (if ,var ,acc ,@else)))
+ then)))
(defmacro -if-let (var-val then &rest else)
"If VAL evaluates to non-nil, bind it to VAR and do THEN,
- [elpa] externals/dash 8d2227d 380/439: Silence unused variable warning in -table, (continued)
- [elpa] externals/dash 8d2227d 380/439: Silence unused variable warning in -table, Phillip Lord, 2015/08/04
- [elpa] externals/dash 47e11ae 378/439: Update docs, Phillip Lord, 2015/08/04
- [elpa] externals/dash d0c6fc0 371/439: Merge pull request #104 from fbergroth/linkify-docs, Phillip Lord, 2015/08/04
- [elpa] externals/dash faeb61a 379/439: Merge pull request #105 from fbergroth/debug-forms, Phillip Lord, 2015/08/04
- [elpa] externals/dash c40fa44 383/439: Exclude byte compilation test on emacs23, Phillip Lord, 2015/08/04
- [elpa] externals/dash a06e66e 382/439: Add test for clean byte compilation, Phillip Lord, 2015/08/04
- [elpa] externals/dash 5f879b3 387/439: Merge pull request #110 from bbatsov/comment-fix, Phillip Lord, 2015/08/04
- [elpa] externals/dash b7c2f9a 381/439: Work around byte compiler in -if-let*, Phillip Lord, 2015/08/04
- [elpa] externals/dash 9642c4a 385/439: [Fix #108] Sync indentation of threading forms with Clojure, Phillip Lord, 2015/08/04
- [elpa] externals/dash 1ccd2b4 389/439: Improve byte compilation test, Phillip Lord, 2015/08/04
- [elpa] externals/dash afe2781 388/439: Merge pull request #109 from bbatsov/threading-indentation,
Phillip Lord <=
- [elpa] externals/dash 2eefbec 386/439: Don't use an inline comment on a line of its own, Phillip Lord, 2015/08/04
- [elpa] externals/dash dab0d1c 384/439: Merge pull request #107 from fbergroth/workaround-byte-compiler, Phillip Lord, 2015/08/04
- [elpa] externals/dash 7d62b1a 393/439: Make test suite independent of dash, Phillip Lord, 2015/08/04
- [elpa] externals/dash 26c1bbe 390/439: Merge pull request #113 from fbergroth/fix-byte-compile-test, Phillip Lord, 2015/08/04
- [elpa] externals/dash c34e4ab 394/439: Update invalid tests, Phillip Lord, 2015/08/04
- [elpa] externals/dash 07f0358 392/439: Add test case operator !!> for expected errors, Phillip Lord, 2015/08/04
- [elpa] externals/dash 92ed7ff 391/439: Use vendored ert only on emacs23, Phillip Lord, 2015/08/04
- [elpa] externals/dash 7aec562 430/439: Merge pull request #140 from mijoharas/master, Phillip Lord, 2015/08/04
- [elpa] externals/dash 63d2db9 431/439: make ->>'s second arg optional, Phillip Lord, 2015/08/04
- [elpa] externals/dash 45bd985 427/439: Reimplementation of --group-by., Phillip Lord, 2015/08/04