diff options
| author | defanor <defanor@uberspace.net> | 2021-09-16 23:49:33 +0300 |
|---|---|---|
| committer | defanor <defanor@uberspace.net> | 2021-09-16 23:49:33 +0300 |
| commit | 7ce58c208a79d4209f0bb036b7c0a2ea6695a867 (patch) | |
| tree | 19e2cb2d71cc1e218cb341dd292311a35d028f5c | |
| parent | c8874706acb76a7bff76d2b318d5cd5946772da0 (diff) | |
Print full presence string in xmpp.el's MUC buffers
| -rw-r--r-- | emacs/xmpp.el | 50 |
1 files changed, 21 insertions, 29 deletions
diff --git a/emacs/xmpp.el b/emacs/xmpp.el index 0eb98c6..6966b36 100644 --- a/emacs/xmpp.el +++ b/emacs/xmpp.el @@ -201,39 +201,32 @@ (presence-type (or (xml-get-attribute-or-nil xml 'type) "available")) (presence-show (car (xml-node-children (xmpp-xml-child xml 'show)))) (presence-status (car (xml-node-children (xmpp-xml-child xml 'status)))) + (presence-string + (concat + presence-from " is " + presence-type + (when presence-show + (concat " (" presence-show ")")) + (when presence-status + (concat ": " presence-status)))) (bare-jid (xmpp-jid-to-bare presence-from)) (resourcepart (xmpp-jid-resource presence-from))) + (add-face-text-property + 0 + (length presence-string) + 'xmpp-presence + nil + presence-string) (when (assoc bare-jid xmpp-query-buffers) (with-current-buffer (cdr (assoc bare-jid xmpp-query-buffers)) - (let ((presence-string - (concat - presence-from " is " - presence-type - (when presence-show - (concat " (" presence-show ")")) - (when presence-status - (concat ": " presence-status))))) - (add-face-text-property - 0 - (length presence-string) - 'xmpp-presence - nil - presence-string) - (xmpp-insert (concat - (xmpp-timestamp-string) ", " - presence-string "\n"))))) + (xmpp-insert (concat + (xmpp-timestamp-string) ", " + presence-string "\n")))) (when (assoc bare-jid xmpp-muc-buffers) (with-current-buffer (cdr (assoc bare-jid xmpp-muc-buffers)) - (let ((presence-string (concat resourcepart " is " presence-type))) - (add-face-text-property - 0 - (length presence-string) - 'xmpp-presence - nil - presence-string) - (xmpp-insert - (concat (xmpp-timestamp-string) ", " - presence-string "\n")))))))) + (xmpp-insert + (concat (xmpp-timestamp-string) ", " + presence-string "\n"))))))) (when (eq (xml-node-name xml) 'message) (xmpp-with-message-body proc xml @@ -465,8 +458,7 @@ (goto-char xmpp-prompt-start-marker) (funcall 'insert args) (set-marker xmpp-prompt-start-marker (point)) - (set-marker xmpp-prompt-end-marker (+ 2 (point)))) - (goto-char (point-max))) + (set-marker xmpp-prompt-end-marker (+ 2 (point))))) (defun xmpp-insert-xml (xml) (save-excursion |