summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Bockgård <bojohan@gnu.org>2015-09-05 17:10:50 +0200
committerJohan Bockgård <bojohan@gnu.org>2015-09-05 18:58:24 +0200
commit96d6689d3c9b7ed3ea791c6a6c0345e89ba209f9 (patch)
tree71cb37be0ad235164fef33251029baabcf1bbd2a
parent6d2a3ca2fc60d89a2454a0ee6cd4e814801e4e39 (diff)
Use PAT rather than UPAT in pcase macros
* lisp/emacs-lisp/cl-macs.el (cl-struct) <pcase-defmacro>: * lisp/emacs-lisp/eieio.el (eieio) <pcase-defmacro>: Use PAT rather than UPAT.
-rw-r--r--lisp/emacs-lisp/cl-macs.el6
-rw-r--r--lisp/emacs-lisp/eieio.el6
2 files changed, 6 insertions, 6 deletions
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 06e75b3667..30581e37e9 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2777,10 +2777,10 @@ non-nil value, that slot cannot be set via `setf'.
;;;###autoload
(pcase-defmacro cl-struct (type &rest fields)
"Pcase patterns to match cl-structs.
-Elements of FIELDS can be of the form (NAME UPAT) in which case the contents of
-field NAME is matched against UPAT, or they can be of the form NAME which
+Elements of FIELDS can be of the form (NAME PAT) in which case the contents of
+field NAME is matched against PAT, or they can be of the form NAME which
is a shorthand for (NAME NAME)."
- (declare (debug (sexp &rest [&or (sexp pcase-UPAT) sexp])))
+ (declare (debug (sexp &rest [&or (sexp pcase-PAT) sexp])))
`(and (pred (pcase--flip cl-typep ',type))
,@(mapcar
(lambda (field)
diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el
index 23203003d0..d6c27be056 100644
--- a/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@ -349,10 +349,10 @@ variable name of the same name as the slot."
(pcase-defmacro eieio (&rest fields)
"Pcase patterns to match EIEIO objects.
-Elements of FIELDS can be of the form (NAME UPAT) in which case the contents of
-field NAME is matched against UPAT, or they can be of the form NAME which
+Elements of FIELDS can be of the form (NAME PAT) in which case the contents of
+field NAME is matched against PAT, or they can be of the form NAME which
is a shorthand for (NAME NAME)."
- (declare (debug (&rest [&or (sexp pcase-UPAT) sexp])))
+ (declare (debug (&rest [&or (sexp pcase-PAT) sexp])))
(let ((is (make-symbol "table")))
;; FIXME: This generates a horrendous mess of redundant let bindings.
;; `pcase' needs to be improved somehow to introduce let-bindings more