[Emacs-diffs] /srv/bzr/emacs/trunk r101636: * lisp/emacs-lisp/pcase.el (pcase-let*, pcase-let): plet -> pcase-let.

[Stefan Monnier]

------------------------------------------------------------
revno: 101636
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2010-09-27 00:42:53 +0200
message:
  * lisp/emacs-lisp/pcase.el (pcase-let*, pcase-let): plet -> pcase-let.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/pcase.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-26 15:30:44 +0000
+++ b/lisp/ChangeLog    2010-09-26 22:42:53 +0000
@@ -1,3 +1,7 @@
+2010-09-26  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/pcase.el (pcase-let*, pcase-let): plet -> pcase-let.
+
 2010-09-26  Lars Magne Ingebrigtsen  <address@hidden>
 
        * net/gnutls.el (starttls-negotiate): Avoid the cl.el decf function.

=== modified file 'lisp/emacs-lisp/pcase.el'
--- a/lisp/emacs-lisp/pcase.el  2010-09-01 10:03:08 +0000
+++ b/lisp/emacs-lisp/pcase.el  2010-09-26 22:42:53 +0000
@@ -76,8 +76,8 @@
 of the form (UPAT EXP)."
   (if (null bindings) body
     `(pcase ,(cadr (car bindings))
-       (,(caar bindings) (plet* ,(cdr bindings) ,body))
-       (t (error "Pattern match failure in `plet'")))))
+       (,(caar bindings) (pcase-let* ,(cdr bindings) ,body))
+       (t (error "Pattern match failure in `pcase-let'")))))
 
 ;;;###autoload
 (defmacro pcase-let (bindings body)
@@ -85,13 +85,14 @@
 BODY should be an expression, and BINDINGS should be a list of bindings
 of the form (UPAT EXP)."
   (if (null (cdr bindings))
-      `(plet* ,bindings ,body)
+      `(pcase-let* ,bindings ,body)
     (setq bindings (mapcar (lambda (x) (cons (make-symbol "x") x)) bindings))
     `(let ,(mapcar (lambda (binding) (list (nth 0 binding) (nth 2 binding)))
                    bindings)
-       (plet* ,(mapcar (lambda (binding) (list (nth 1 binding) (nth 0 
binding)))
-                       bindings)
-              ,body))))
+       (pcase-let*
+        ,(mapcar (lambda (binding) (list (nth 1 binding) (nth 0 binding)))
+                 bindings)
+        ,body))))
 
 (defun pcase-expand (exp cases)
   (let* ((defs (if (symbolp exp) '()