hiro/ement.el
1
0
Fork 0
mirror of https://github.com/vale981/ement.el synced 2025-03-06 01:31:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change/Fix: (ement-complete-room, ement-view-room) Suggesting room

Browse source 
Don't suggest the current room when switching between room buffers, as
that requires the user to clear the input before completing another
room.
This commit is contained in:
Adam Porter 2022-03-25 23:35:25 -05:00
parent 713efc0d59
commit 8a889aa7f6
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ement.el
View file

@ -272,7 +272,7 @@ in them won't work."
"Switch to a buffer showing ROOM on SESSION. "Switch to a buffer showing ROOM on SESSION.
Calls `pop-to-buffer-same-window'. Interactively, with prefix, Calls `pop-to-buffer-same-window'. Interactively, with prefix,
call `pop-to-buffer'." call `pop-to-buffer'."
(interactive (ement-complete-room (ement-complete-session))) (interactive (ement-complete-room (ement-complete-session) nil))
(pcase-let* (((cl-struct ement-room (local (map buffer))) room)) (pcase-let* (((cl-struct ement-room (local (map buffer))) room))
(unless (buffer-live-p buffer) (unless (buffer-live-p buffer)
(setf buffer (ement-room--buffer session room (setf buffer (ement-room--buffer session room
@ -503,9 +503,12 @@ If no URI is found, prompt the user for the hostname."
(alist-get selected-id ement-sessions nil nil #'equal))) (alist-get selected-id ement-sessions nil nil #'equal)))
(otherwise (user-error "No active sessions. Call `ement-connect' to log in")))) (otherwise (user-error "No active sessions. Call `ement-connect' to log in"))))
(defun ement-complete-room (&optional session) (cl-defun ement-complete-room (&optional session (suggest t))
"Return a (room session) list selected from SESSION with completion. "Return a (room session) list selected from SESSION with completion.
If SESSION is nil, select from rooms in all of `ement-sessions'." If SESSION is nil, select from rooms in all of `ement-sessions'.
When SUGGEST, suggest current buffer's room as initial
input (i.e. it should be set to nil when switching from one room
buffer to another)."
(pcase-let* ((sessions (if session (pcase-let* ((sessions (if session
(list session) (list session)
(mapcar #'cdr ement-sessions))) (mapcar #'cdr ement-sessions)))
@ -521,7 +524,7 @@ If SESSION is nil, select from rooms in all of `ement-sessions'."
(list room session))))) (list room session)))))
(names (mapcar #'car name-to-room-session)) (names (mapcar #'car name-to-room-session))
(selected-name (completing-read "Room: " names nil t (selected-name (completing-read "Room: " names nil t
(when (equal major-mode 'ement-room-mode) (when (and suggest (equal major-mode 'ement-room-mode))
;; Suggest current buffer's room. ;; Suggest current buffer's room.
(format "%s (%s)" (format "%s (%s)"
(or (ement-room-display-name ement-room) (or (ement-room-display-name ement-room)