From: Glenn Morris <rgm@gnu.org>
Date: Wed, 17 Jun 2015 00:44:57 +0000 (-0400)
Subject: * lisp/emacs-lisp/pcase.el (pcase--u1): Revert earlier workaround.
X-Git-Tag: emacs-25.0.90~1730
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d3b779fa79f3570879b2df2effa683c3b4aaa96a;p=emacs.git

* lisp/emacs-lisp/pcase.el (pcase--u1): Revert earlier workaround.

No longer needed.
---

diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el
index bcc2d58a0bc..50a25072128 100644
--- a/lisp/emacs-lisp/pcase.el
+++ b/lisp/emacs-lisp/pcase.el
@@ -774,9 +774,9 @@ Otherwise, it defers to REST which is a list of branches of the form
        ((memq upat '(t _))
         (let ((code (pcase--u1 matches code vars rest)))
           (if (eq upat '_) code
-            (message "%s"
-             "Pattern t is deprecated.  Use `_' instead")
-             code)))
+            (macroexp--warn-and-return
+             "Pattern t is deprecated.  Use `_' instead"
+             code))))
        ((eq upat 'pcase--dontcare) :pcase--dontcare)
        ((memq (car-safe upat) '(guard pred))
         (if (eq (car upat) 'pred) (pcase--mark-used sym))