From: Mattias Engdegård <mattiase@acm.org>
Date: Fri, 28 May 2021 09:51:32 +0000 (+0200)
Subject: ; * lisp/emacs-lisp/rx.el (rx--pcase-macroexpander): slight rephrase
X-Git-Tag: emacs-28.0.90~2280
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0cbfb7e7951e3a3e277835958f6daa139a653c52;p=emacs.git

; * lisp/emacs-lisp/rx.el (rx--pcase-macroexpander): slight rephrase
---

diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index 43bd84d9990..071d390f0e4 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -1442,10 +1442,9 @@ following constructs:
                    introduced by a previous (let REF ...)
                    construct."
   (let* ((rx--pcase-vars nil)
-         (regexp (rx--to-expr (rx--pcase-transform (cons 'seq regexps))))
-         (nvars (length rx--pcase-vars)))
+         (regexp (rx--to-expr (rx--pcase-transform (cons 'seq regexps)))))
     `(and (pred stringp)
-          ,(pcase nvars
+          ,(pcase (length rx--pcase-vars)
             (0
              ;; No variables bound: a single predicate suffices.
              `(pred (string-match ,regexp)))
@@ -1458,7 +1457,7 @@ following constructs:
                          (match-string 1 s)
                        0))
                    (and ,(car rx--pcase-vars) (pred (not numberp)))))
-            (_
+            (nvars
              ;; Pack the submatches into a dotted list which is then
              ;; immediately destructured into individual variables again.
              ;; This is of course slightly inefficient.