diff options
-rw-r--r-- | lisp/ChangeLog | 7 | ||||
-rw-r--r-- | lisp/emacs-lisp/pcase.el | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 70452c73254..a66cabab108 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-11-12 Stefan Monnier <monnier@iro.umontreal.ca> + + * emacs-lisp/pcase.el (pcase-let*, pcase-let): Add debug and + indentation specs. + 2010-11-11 Stefan Monnier <monnier@iro.umontreal.ca> * progmodes/modula2.el: Use SMIE and skeleton. @@ -57,7 +62,7 @@ * emacs-lisp/package.el (package-read-all-archive-contents): Reset package-archive-contents to nil before re-reading. -2010-11-10 Brandon Craig Rhodes <brandon@rhodesmill.org> +2010-11-10 Brandon Craig Rhodes <brandon@rhodesmill.org> (tiny change) * textmodes/flyspell.el (flyspell-word): Do not re-check words already found as misspellings by (flyspell-large-region), just diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el index 90f2bf411b5..0e01758b559 100644 --- a/lisp/emacs-lisp/pcase.el +++ b/lisp/emacs-lisp/pcase.el @@ -75,7 +75,7 @@ PRED patterns can refer to variables bound earlier in the pattern. E.g. you can match pairs where the cdr is larger than the car with a pattern like `(,a . ,(pred (< a))) or, with more checks: `(,(and a (pred numberp)) . ,(and (pred numberp) (pred (< a))))" - (declare (indent 1) (debug case)) + (declare (indent 1) (debug case)) ;FIXME: edebug `guard' and vars. (or (gethash (cons exp cases) pcase-memoize) (puthash (cons exp cases) (pcase-expand exp cases) @@ -86,6 +86,7 @@ like `(,a . ,(pred (< a))) or, with more checks: "Like `let*' but where you can use `pcase' patterns for bindings. BODY should be an expression, and BINDINGS should be a list of bindings of the form (UPAT EXP)." + (declare (indent 1) (debug let)) (if (null bindings) body `(pcase ,(cadr (car bindings)) (,(caar bindings) (pcase-let* ,(cdr bindings) ,body)) @@ -98,6 +99,7 @@ of the form (UPAT EXP)." "Like `let' but where you can use `pcase' patterns for bindings. BODY should be an expression, and BINDINGS should be a list of bindings of the form (UPAT EXP)." + (declare (indent 1) (debug let)) (if (null (cdr bindings)) `(pcase-let* ,bindings ,body) (setq bindings (mapcar (lambda (x) (cons (make-symbol "x") x)) bindings)) |