branch: elpa/jabber
commit 7ec2d317cd9d241a02f6d54f52b6d9278f04a32c
Author: Thanos Apollo <[email protected]>
Commit: Thanos Apollo <[email protected]>
chatstates: Remove header-line indicator leftovers
---
lisp/jabber-chatstates.el | 11 -----------
lisp/jabber-muc.el | 13 -------------
2 files changed, 24 deletions(-)
diff --git a/lisp/jabber-chatstates.el b/lisp/jabber-chatstates.el
index a1e9a4fb7f..33e2b4a5ff 100644
--- a/lisp/jabber-chatstates.el
+++ b/lisp/jabber-chatstates.el
@@ -64,9 +64,6 @@ Non-nil means send states, nil means don't.")
(defvar-local jabber-chatstates-last-state nil
"The last seen chat state.")
-(defvar-local jabber-chatstates-message ""
- "Human-readable presentation of chat state information.")
-
(defvar-local jabber-chatstates--ewoc-node nil
"Ewoc node for the typing indicator, or nil.")
@@ -81,14 +78,6 @@ It can be sent and cancelled several times.")
;; Code for requesting chat state notifications from others and handling
;; them.
-(defun jabber-chatstates-update-message ()
- "Refresh the mode-line indicator for the peer's last chat state."
- (setq jabber-chatstates-message
- (if (and jabber-chatstates-last-state
- (not (eq 'active jabber-chatstates-last-state)))
- (format " (%s)" (symbol-name jabber-chatstates-last-state))
- "")))
-
(defun jabber-chatstates--update-ewoc (state)
"Show or remove the typing indicator ewoc node for STATE."
(let ((inhibit-read-only t))
diff --git a/lisp/jabber-muc.el b/lisp/jabber-muc.el
index 663740d762..bdc7417dc4 100644
--- a/lisp/jabber-muc.el
+++ b/lisp/jabber-muc.el
@@ -299,22 +299,9 @@ These fields are about your account:
:type 'string
:group 'jabber-chat)
-
-(defcustom jabber-muc-print-names-format " %n %a %j\n"
- "The format specification for MUC list lines.
-
-Fields available:
-
-%n Nickname in room
-%a Affiliation status
-%j Full JID (room@server/nick)"
- :type 'string
- :group 'jabber-chat)
-
(defcustom jabber-muc-private-header-line-format
'(" " (:eval (jabber-jid-resource jabber-chatting-with))
" in " (:eval (jabber-jid-displayname (jabber-jid-user
jabber-chatting-with)))
- "\t" (:eval jabber-chatstates-message)
" " (:eval jabber-chat-encryption-message)) ;see
jabber-chatbuffer.el
"The specification for the header line of private MUC chat buffers.
