branch: externals/ement
commit 218cd1de07fc2e7bd2d8e541cfc33f31b1a282ac
Merge: 4d44ea274c 7f39fa5694
Author: Adam Porter <a...@alphapapa.net>
Commit: Adam Porter <a...@alphapapa.net>
Merge: v0.9.2
---
README.org | 6 ++++++
ement-room-list.el | 4 ++--
ement-room.el | 10 +++++++---
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/README.org b/README.org
index 5995436ea2..ec7fc9c4b9 100644
--- a/README.org
+++ b/README.org
@@ -302,6 +302,12 @@ Note that, while ~matrix-client~ remains usable, and
probably will for some time
+ Improve readme export settings.
+** 0.9.2
+
+*Fixes*
++ Restore position in room list when refreshing.
++ Completion in minibuffer.
+
** 0.9.1
*Fixes*
diff --git a/ement-room-list.el b/ement-room-list.el
index bbdbfa69c8..49a8d9ddde 100644
--- a/ement-room-list.el
+++ b/ement-room-list.el
@@ -548,7 +548,7 @@ BUFFER-NAME and is shown with DISPLAY-BUFFER-ACTION; or if
DISPLAY-BUFFER-ACTION is nil, the buffer is not displayed."
(interactive)
(let ((inhibit-read-only t)
- format-table column-sizes window-start room-session-vectors)
+ pos format-table column-sizes window-start room-session-vectors)
(cl-labels (;; (heading-face
;; (depth) (list :inherit (list 'bufler-group
(bufler-level-face depth))))
(format-item (item) (gethash item format-table))
@@ -621,6 +621,7 @@ DISPLAY-BUFFER-ACTION is nil, the buffer is not displayed."
append (cl-loop for room in (ement-session-rooms session)
collect (vector room session))))
(with-current-buffer (get-buffer-create buffer-name)
+ (setf pos (point))
(ement-room-list-mode)
(delete-all-overlays)
(erase-buffer)
@@ -660,7 +661,6 @@ DISPLAY-BUFFER-ACTION is nil, the buffer is not displayed."
(taxy-magit-section-insert-indent-items nil)
(format-cons (taxy-magit-section-format-items
ement-room-list-columns
ement-room-list-column-formatters taxy))
- (pos (point))
(section-ident (when (magit-current-section)
(magit-section-ident
(magit-current-section)))))
(setf format-table (car format-cons)
diff --git a/ement-room.el b/ement-room.el
index 2436167c86..c01190dd65 100644
--- a/ement-room.el
+++ b/ement-room.el
@@ -4275,8 +4275,10 @@ Web-compatible HTML output, using HTML like:
Uses members in the current buffer's room. For use in
`completion-at-point-functions'."
(let ((beg (save-excursion
- (when (re-search-backward (rx (or bol bos blank) "@") nil t)
- (point))))
+ (when (re-search-backward (rx (or bol bos blank)) nil t)
+ (if (minibufferp)
+ (1+ (point))
+ (point)))))
(end (point))
(collection-fn (completion-table-dynamic
;; The manual seems to show the FUN ignoring any
@@ -4292,7 +4294,9 @@ Uses members in the current buffer's room. For use in
For use in `completion-at-point-functions'."
(let ((beg (save-excursion
(when (re-search-backward (rx (or bol bos blank) (or "!" "#"))
nil t)
- (point))))
+ (if (minibufferp)
+ (1+ (point))
+ (point)))))
(end (point))
(collection-fn (completion-table-dynamic
;; The manual seems to show the FUN ignoring any
