[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/dash faeb61a 379/439: Merge pull request #105 from fber
From: |
Phillip Lord |
Subject: |
[elpa] externals/dash faeb61a 379/439: Merge pull request #105 from fbergroth/debug-forms |
Date: |
Tue, 04 Aug 2015 20:30:50 +0000 |
branch: externals/dash
commit faeb61a0b8a437ad550310c365176b757ad033da
Merge: 446c522 47e11ae
Author: Magnar Sveen <address@hidden>
Commit: Magnar Sveen <address@hidden>
Merge pull request #105 from fbergroth/debug-forms
Update debug forms
---
README.md | 6 +++---
dash.el | 16 ++++++++--------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index 555da08..b3635d4 100644
--- a/README.md
+++ b/README.md
@@ -1677,7 +1677,7 @@ If all `vals` evaluate to true, bind them to their
corresponding
`vars` and execute body. `vars-vals` should be a list of (`var` `val`)
pairs.
-Note: binding is done according to [`-let`](#-let-varlist-rest-body).
+Note: binding is done according to [`-let*`](#-let-varlist-rest-body).
```el
(-when-let* ((x 5) (y 3) (z (+ y 4))) (+ x y z)) ;; => 15
@@ -1702,7 +1702,7 @@ If all `vals` evaluate to true, bind them to their
corresponding
`vars` and do `then`, otherwise do `else`. `vars-vals` should be a list
of (`var` `val`) pairs.
-Note: binding is done according to [`-let`](#-let-varlist-rest-body).
+Note: binding is done according to [`-let*`](#-let-varlist-rest-body).
```el
(-if-let* ((x 5) (y 3) (z 7)) (+ x y z) "foo") ;; => 15
@@ -2256,7 +2256,7 @@ Change `readme-template.md` or `examples-to-docs.el`
instead.
- [Johan Andersson](https://github.com/rejeep) contributed `-sum`, `-product`
and `-same-items?`
- [Christina Whyte](https://github.com/kurisuwhyte) contributed `-compose`
- [Steve Lamb](https://github.com/steventlamb) contributed `-cycle`, `-pad`,
`-annotate`, `-zip-fill` and an n-ary version of `-zip`.
- - [Fredrik Bergroth](https://github.com/fbergroth) made the `-if-let` family
use `-let` desctructuring and improved script for generating documentation.
+ - [Fredrik Bergroth](https://github.com/fbergroth) made the `-if-let` family
use `-let` destructuring and improved script for generating documentation.
Thanks!
diff --git a/dash.el b/dash.el
index 0d2f33c..74dbcab 100644
--- a/dash.el
+++ b/dash.el
@@ -1126,8 +1126,8 @@ sorts it in descending order."
`(pop ,source))
(t
`(progn
- (setq ,s (nthcdr ,skip-cdr ,s))
- (pop ,s)))))
+ (setq ,source (nthcdr ,skip-cdr ,source))
+ (pop ,source)))))
(defun dash--match-cons-get-car (skip-cdr source)
"Helper function generating idiomatic code to get nth car."
@@ -1496,8 +1496,8 @@ See `-let' for the description of destructuring
mechanism."
VARS and do THEN, otherwise do ELSE. VARS-VALS should be a list
of (VAR VAL) pairs.
-Note: binding is done according to `-let'."
- (declare (debug ((&rest (symbolp form)) form body))
+Note: binding is done according to `-let*'."
+ (declare (debug ((&rest (sexp form)) form body))
(indent 2))
(->> vars-vals
(-mapcat (-lambda ((pat src)) (dash--match pat src)))
@@ -1512,7 +1512,7 @@ Note: binding is done according to `-let'."
otherwise do ELSE. VAR-VAL should be a (VAR VAL) pair.
Note: binding is done according to `-let'."
- (declare (debug ((symbolp form) form body))
+ (declare (debug ((sexp form) form body))
(indent 2))
`(-if-let* (,var-val) ,then ,@else))
@@ -1528,8 +1528,8 @@ otherwise do ELSE."
VARS and execute body. VARS-VALS should be a list of (VAR VAL)
pairs.
-Note: binding is done according to `-let'."
- (declare (debug ((&rest (symbolp form)) body))
+Note: binding is done according to `-let*'."
+ (declare (debug ((&rest (sexp form)) body))
(indent 1))
`(-if-let* ,vars-vals (progn ,@body)))
@@ -1538,7 +1538,7 @@ Note: binding is done according to `-let'."
VAR-VAL should be a (VAR VAL) pair.
Note: binding is done according to `-let'."
- (declare (debug ((symbolp form) body))
+ (declare (debug ((sexp form) body))
(indent 1))
`(-if-let ,var-val (progn ,@body)))
- [elpa] externals/dash d459b49 374/439: Fix typo, (continued)
- [elpa] externals/dash d459b49 374/439: Fix typo, Phillip Lord, 2015/08/04
- [elpa] externals/dash c09c0f6 372/439: Merge branch 'more-destructuring' (#103) of https://github.com/fbergroth/dash.el, Phillip Lord, 2015/08/04
- [elpa] externals/dash 38ef86e 376/439: Update debug forms for -if-let and -when-let, Phillip Lord, 2015/08/04
- [elpa] externals/dash 446c522 375/439: Release 2.10.0, Phillip Lord, 2015/08/04
- [elpa] externals/dash 5e9c1a9 373/439: Add Fredrik Bergroth to the list of contributors, Phillip Lord, 2015/08/04
- [elpa] externals/dash c134705 377/439: Fix compile warning, Phillip Lord, 2015/08/04
- [elpa] externals/dash c7b4cff 370/439: Update readme.md, Phillip Lord, 2015/08/04
- [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 <=
- [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, 2015/08/04
- [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