aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-05-15 14:45:27 -0400
committerStefan Monnier2012-05-15 14:45:27 -0400
commitc41045e6f2b9e9aa5ab8c7c679a2ea04b130fca3 (patch)
treeb287fecde0e207e8662b33128dd6f7ee1de9d744
parent036dfb8b567cf4b382c7333de25ed3fd85dfed8a (diff)
downloademacs-c41045e6f2b9e9aa5ab8c7c679a2ea04b130fca3.tar.gz
emacs-c41045e6f2b9e9aa5ab8c7c679a2ea04b130fca3.zip
* lisp/emacs-lisp/pcase.el (pcase-let*, pcase-let): Fix edebug spec.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/emacs-lisp/pcase.el5
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac2aff0d9c7..717582a6f8f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-05-15 Stefan Monnier <monnier@iro.umontreal.ca> 12012-05-15 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * emacs-lisp/pcase.el (pcase-let*, pcase-let): Fix edebug spec.
4
3 * minibuffer.el (completion--sifn-requote): Handle sifn's truncation 5 * minibuffer.el (completion--sifn-requote): Handle sifn's truncation
4 behavior. 6 behavior.
5 (completion--string-equal-p): New function. 7 (completion--string-equal-p): New function.
diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el
index 0d115cc56f5..28eaa3d3455 100644
--- a/lisp/emacs-lisp/pcase.el
+++ b/lisp/emacs-lisp/pcase.el
@@ -113,7 +113,8 @@ like `(,a . ,(pred (< a))) or, with more checks:
113 "Like `let*' but where you can use `pcase' patterns for bindings. 113 "Like `let*' but where you can use `pcase' patterns for bindings.
114BODY should be an expression, and BINDINGS should be a list of bindings 114BODY should be an expression, and BINDINGS should be a list of bindings
115of the form (UPAT EXP)." 115of the form (UPAT EXP)."
116 (declare (indent 1) (debug let)) 116 (declare (indent 1)
117 (debug ((&rest &or (sexp &optional form) symbolp) body)))
117 (cond 118 (cond
118 ((null bindings) (if (> (length body) 1) `(progn ,@body) (car body))) 119 ((null bindings) (if (> (length body) 1) `(progn ,@body) (car body)))
119 ((pcase--trivial-upat-p (caar bindings)) 120 ((pcase--trivial-upat-p (caar bindings))
@@ -132,7 +133,7 @@ of the form (UPAT EXP)."
132 "Like `let' but where you can use `pcase' patterns for bindings. 133 "Like `let' but where you can use `pcase' patterns for bindings.
133BODY should be a list of expressions, and BINDINGS should be a list of bindings 134BODY should be a list of expressions, and BINDINGS should be a list of bindings
134of the form (UPAT EXP)." 135of the form (UPAT EXP)."
135 (declare (indent 1) (debug let)) 136 (declare (indent 1) (debug pcase-let*))
136 (if (null (cdr bindings)) 137 (if (null (cdr bindings))
137 `(pcase-let* ,bindings ,@body) 138 `(pcase-let* ,bindings ,@body)
138 (let ((matches '())) 139 (let ((matches '()))