emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/ement 64049a21fa: Fix: (ement-leave/forget-room) Intera


From: ELPA Syncer
Subject: [elpa] externals/ement 64049a21fa: Fix: (ement-leave/forget-room) Interactive prompts
Date: Wed, 22 Mar 2023 10:58:32 -0400 (EDT)

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

    Fix: (ement-leave/forget-room) Interactive prompts
---
 README.org   |  1 +
 ement-lib.el | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.org b/README.org
index 3167957fa3..d91bfd8d16 100644
--- a/README.org
+++ b/README.org
@@ -311,6 +311,7 @@ Note that, while ~matrix-client~ remains usable, and 
probably will for some time
 *Fixes*
 
 + Improve insertion of sender name headers when using the "Elemental" message 
format.
++ Prompts in commands ~ement-leave-room~ and ~ement-forget-room~.
 
 ** 0.7
 
diff --git a/ement-lib.el b/ement-lib.el
index af743c6829..c04eb8bf11 100644
--- a/ement-lib.el
+++ b/ement-lib.el
@@ -150,9 +150,10 @@ the request."
 If FORCE-P, leave without prompting.  ROOM may be an `ement-room'
 struct, or a room ID or alias string."
   ;; TODO: Rename `room' argument to `room-or-id'.
-  (interactive (ement-complete-room :session (ement-complete-session)
-                 :prompt "Leave room: "))
-  (cl-assert room) (cl-assert session)
+  (interactive
+   (ement-with-room-and-session
+     :prompt-form (ement-complete-room :prompt "Leave room: ")
+     (list ement-room ement-session)))
   (cl-etypecase room
     (ement-room)
     (string (setf room (ement-afirst (or (equal room 
(ement-room-canonical-alias it))
@@ -190,8 +191,10 @@ struct, or a room ID or alias string."
   "Forget ROOM on SESSION.
 If FORCE-P (interactively, with prefix), prompt to leave the room
 when necessary, and forget the room without prompting."
-  (interactive (ement-complete-room :session (ement-complete-session)
-                 :prompt "Forget room: "))
+  (interactive
+   (ement-with-room-and-session
+     :prompt-form (ement-complete-room :prompt "Forget room: ")
+     (list ement-room ement-session current-prefix-arg)))
   (pcase-let* (((cl-struct ement-room id display-name status) room)
                (endpoint (format "rooms/%s/forget" (url-hexify-string id))))
     (pcase status



reply via email to

[Prev in Thread] Current Thread [Next in Thread]