branch: elpa/jabber
commit 54d9db1b15e91879d7f8004eca8ac6812639c6b4
Author: Thanos Apollo <[email protected]>
Commit: Thanos Apollo <[email protected]>
deps: Use available feature providers
---
lisp/jabber-bookmarks.el | 3 +--
lisp/jabber-chatstates.el | 5 ++---
lisp/jabber-reactions.el | 3 +--
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/lisp/jabber-bookmarks.el b/lisp/jabber-bookmarks.el
index bb44f5a2c0..e85ddf08a5 100644
--- a/lisp/jabber-bookmarks.el
+++ b/lisp/jabber-bookmarks.el
@@ -29,6 +29,7 @@
(require 'cl-lib)
(require 'fsm)
+(require 'jabber-disco)
(require 'jabber-private)
(require 'jabber-pubsub)
(require 'jabber-muc-state)
@@ -58,8 +59,6 @@
(defvar jabber-pre-disconnect-hook) ; jabber-core.el
-(declare-function jabber-disco-get-info "jabber-disco.el"
- (jc jid node callback closure-data &optional force))
(declare-function jabber-muc-join "jabber-muc" (jc group nickname &optional
popup))
(declare-function jabber-muc-leave "jabber-muc" (jc group))
(declare-function jabber-muc-get-buffer "jabber-muc" (group &optional jc))
diff --git a/lisp/jabber-chatstates.el b/lisp/jabber-chatstates.el
index 68b9d3c119..ccbd340534 100644
--- a/lisp/jabber-chatstates.el
+++ b/lisp/jabber-chatstates.el
@@ -37,6 +37,7 @@
(require 'jabber-chatbuffer)
(require 'jabber-disco)
(require 'jabber-muc-state)
+(require 'jabber-reactions)
(require 'jabber-xml)
@@ -44,7 +45,6 @@
(defvar jabber-chatting-with) ; jabber-chat.el
(declare-function jabber-muc-find-buffer "jabber-muc" (group))
-(declare-function jabber-reactions--reaction-only-p "jabber-reactions"
(xml-data))
(defgroup jabber-chatstates nil
"Chat state notifications."
@@ -292,8 +292,7 @@ Added to `kill-buffer-hook' in chat buffers."
(defun jabber-chatstates--real-body-message-p (xml-data)
"Return non-nil when XML-DATA has a body that should clear chatstates."
(and (jabber-xml-get-children xml-data 'body)
- (not (and (fboundp 'jabber-reactions--reaction-only-p)
- (jabber-reactions--reaction-only-p xml-data)))))
+ (not (jabber-reactions--reaction-only-p xml-data))))
(defun jabber-chatstates--handle-direct-state (jc xml-data from)
"Update the direct chat buffer from XML-DATA sent by FROM on JC."
diff --git a/lisp/jabber-reactions.el b/lisp/jabber-reactions.el
index 8f9a7b3e01..62fdaf9130 100644
--- a/lisp/jabber-reactions.el
+++ b/lisp/jabber-reactions.el
@@ -29,6 +29,7 @@
(require 'cl-lib)
(require 'ewoc)
(require 'subr-x)
+(require 'jabber-chatbuffer)
(require 'jabber-db)
(require 'jabber-disco)
(require 'jabber-util)
@@ -68,8 +69,6 @@ are not filtered against it."
(defvar jabber-point-insert)
(declare-function jabber-chat--unwrap-carbon "jabber-chat" (jc xml-data))
-(declare-function jabber-chat-ewoc-find-by-id "jabber-chatbuffer" (stanza-id))
-(declare-function jabber-chat-ewoc-invalidate "jabber-chatbuffer" (node))
(declare-function jabber-chat-find-buffer "jabber-chat" (chat-with))
(declare-function jabber-muc-find-buffer "jabber-muc" (group))
