[elpa] externals/ement 225e6072c6: Fix/Tidy: Incorrect use of etypecase

[ELPA Syncer]

branch: externals/ement
commit 225e6072c682b730be215eddc2b3654a18dd0046
Author: Adam Porter <adam@alphapapa.net>
Commit: Adam Porter <adam@alphapapa.net>

    Fix/Tidy: Incorrect use of etypecase
    
    Fixes #219.
---
 ement-lib.el | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/ement-lib.el b/ement-lib.el
index bf9d7b733b..46c29a18ed 100644
--- a/ement-lib.el
+++ b/ement-lib.el
@@ -774,12 +774,12 @@ THEN and ELSE are passed to `ement-api', which see."
 
 (cl-defun ement-complete-session (&key (prompt "Session: "))
   "Return an Ement session selected with completion."
-  (cl-etypecase (length ement-sessions)
-    ((integer 1 1) (cdar ement-sessions))
-    ((integer 2 *) (let* ((ids (mapcar #'car ement-sessions))
-                          (selected-id (completing-read prompt ids nil t)))
-                     (alist-get selected-id ement-sessions nil nil #'equal)))
-    (otherwise (user-error "No active sessions.  Call `ement-connect' to log 
in"))))
+  (pcase (length ement-sessions)
+    (0 (user-error "No active sessions.  Call `ement-connect' to log in"))
+    (1 (cdar ement-sessions))
+    (_ (let* ((ids (mapcar #'car ement-sessions))
+              (selected-id (completing-read prompt ids nil t)))
+         (alist-get selected-id ement-sessions nil nil #'equal)))))
 
 (declare-function ewoc-locate "ewoc")
 (defun ement-complete-user-id ()
@@ -1499,11 +1499,11 @@ Works in major-modes `ement-room-mode',
                                              nil nil #'equal)))
                   (map-nested-elt event '(content name))))
               (empty-room (heroes joined)
-                (cl-etypecase (length heroes)
-                  ((satisfies zerop) "Empty room")
-                  ((number 1 5) (format "Empty room (was %s)"
-                                        (hero-names heroes)))
-                  (t (format "Empty room (was %s)"
+                (pcase (length heroes)
+                  (0 "Empty room")
+                  ((pred (>= 5)) (format "Empty room (was %s)"
+                                         (hero-names heroes)))
+                  (_ (format "Empty room (was %s)"
                              (heroes-and-others heroes joined))))))
     (or (name-override)
         (latest-event "m.room.name" 'name)