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

Fix: (ement-room--format-body-mentions) Regexp

Browse source 
Thanks to @benoitj:matrix.org for reporting.
This commit is contained in:
Adam Porter 2022-05-08 09:09:27 -05:00
parent 4b94c46c5c
commit c7928d399f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ement-room.el
View file

@ -1425,7 +1425,7 @@ the content (e.g. see `ement-room-send-org-filter')."
(let ((members (ement-room--members-alist room)) (let ((members (ement-room--members-alist room))
(pos 0) (pos 0)
replacement) replacement)
(while (setf pos (string-match (rx (or bos bow) (while (setf pos (string-match (rx (or bos bow (1+ blank))
(group "@" (group (1+ (not blank)) (or eow (seq ":" (1+ blank)))))) (group "@" (group (1+ (not blank)) (or eow (seq ":" (1+ blank))))))
body pos)) body pos))
(if (setf replacement (or (when-let (member (rassoc (match-string 1 body) members)) (if (setf replacement (or (when-let (member (rassoc (match-string 1 body) members))
@ -1436,7 +1436,7 @@ the content (e.g. see `ement-room-send-org-filter')."
(format template user-id (ement--xml-escape-string (match-string 2 body)))))) (format template user-id (ement--xml-escape-string (match-string 2 body))))))
(progn (progn
;; Found member: replace and move to end of replacement. ;; Found member: replace and move to end of replacement.
(setf body (replace-match replacement t t body 0)) (setf body (replace-match replacement t t body 1))
(let ((difference (- (length replacement) (length (match-string 0 body))))) (let ((difference (- (length replacement) (length (match-string 0 body)))))
(setf pos (if (/= 0 difference) (setf pos (if (/= 0 difference)
;; Replacement of a different length: adjust POS accordingly. ;; Replacement of a different length: adjust POS accordingly.