branch: elpa/jabber
commit 941f349efca999e04b7bf6149b0e025a9df76bdc
Author: Thanos Apollo <[email protected]>
Commit: Thanos Apollo <[email protected]>
deps: Load mandatory feature providers
---
lisp/jabber-activity.el | 6 ++----
lisp/jabber-info.el | 28 ++++++----------------------
lisp/jabber-mam.el | 15 +++------------
lisp/jabber-modeline.el | 4 +---
lisp/jabber-vcard.el | 5 ++---
5 files changed, 14 insertions(+), 44 deletions(-)
diff --git a/lisp/jabber-activity.el b/lisp/jabber-activity.el
index 27c73ea9d2..03a5849cec 100644
--- a/lisp/jabber-activity.el
+++ b/lisp/jabber-activity.el
@@ -34,7 +34,9 @@
(require 'seq)
(require 'jabber-core)
(require 'jabber-util)
+(require 'jabber-chat)
(require 'jabber-muc)
+(require 'jabber-muc-nick-completion)
(defgroup jabber-activity nil
"Activity tracking options."
@@ -165,10 +167,6 @@ Invalidated when `jabber-activity-make-name-alist'
rebuilds.")
;; Global reference declarations
-(declare-function jabber-chat-find-buffer "jabber-chat.el" (chat-with))
-(declare-function jabber-chat-with "jabber-chat.el" (jc jid &optional
other-window))
-(declare-function jabber-muc-looks-like-personal-p
- "jabber-muc-nick-completion.el" (message &optional group))
(defvar jabber-buffer-connection) ; jabber-chatbuffer.el
(defvar jabber-silent-mode) ; jabber.el
diff --git a/lisp/jabber-info.el b/lisp/jabber-info.el
index da68d335d2..70d67a3258 100644
--- a/lisp/jabber-info.el
+++ b/lisp/jabber-info.el
@@ -25,32 +25,16 @@
;;; Code:
+(require 'jabber-disco)
+(require 'jabber-iq)
+(require 'jabber-muc)
+(require 'jabber-ping)
+(require 'jabber-time)
(require 'jabber-util)
-(eval-when-compile (require 'jabber-muc)) ; jabber-muc-argument-list macro
+(require 'jabber-version)
;; Global reference declarations
-(declare-function jabber-ping-send "jabber-ping.el"
- (jc to process-func on-success on-error))
-(declare-function jabber-browse--buffer "jabber-iq.el" (jid))
-(declare-function jabber-browse--insert "jabber-iq.el"
- (jc xml-data closure-data))
-(declare-function jabber-send-iq "jabber-iq.el"
- (jc to type query success-callback success-closure-data
- error-callback error-closure-data &optional result-id))
-(declare-function jabber-muc-read-nickname "jabber-muc.el"
- (group prompt))
-(declare-function jabber-process-version "jabber-version.el"
- (jc xml-data))
-(declare-function jabber-process-disco-info "jabber-disco.el"
- (jc xml-data))
-(declare-function jabber-process-ping "jabber-ping.el"
- (jc xml-data))
-(declare-function jabber-process-time "jabber-time.el"
- (jc xml-data))
-(declare-function jabber-process-last "jabber-time.el"
- (jc xml-data))
-
(defvar jabber-group) ; jabber-muc.el
(defvar jabber-buffer-connection) ; jabber-chatbuffer.el
diff --git a/lisp/jabber-mam.el b/lisp/jabber-mam.el
index 881b105712..84f89a4815 100644
--- a/lisp/jabber-mam.el
+++ b/lisp/jabber-mam.el
@@ -36,21 +36,12 @@
(require 'jabber-util)
(require 'jabber-db)
(require 'jabber-chat)
+(require 'jabber-disco)
+(require 'jabber-iq)
+(require 'jabber-message-correct)
(eval-when-compile (require 'cl-lib))
-(declare-function jabber-send-iq "jabber-iq"
- (jc to type query success-callback success-closure-data
- error-callback error-closure-data &optional result-id))
-(declare-function jabber-disco-get-info "jabber-disco"
- (jc jid node callback closure-data &optional force))
-(declare-function jabber-disco-advertise-feature "jabber-disco" (feature))
-(declare-function jabber-message-correct--replace-id "jabber-message-correct"
- (xml-data))
-(declare-function jabber-message-correct--apply "jabber-message-correct"
- (replace-id new-body new-from muc-p buffer
- &optional new-occupant-id))
-
(defvar jabber-buffer-connection) ; jabber-chatbuffer.el
(defvar jabber-chatting-with) ; jabber-chat.el
(defvar jabber-group) ; jabber-muc.el
diff --git a/lisp/jabber-modeline.el b/lisp/jabber-modeline.el
index 0eb50bbe56..1be8b99477 100644
--- a/lisp/jabber-modeline.el
+++ b/lisp/jabber-modeline.el
@@ -28,6 +28,7 @@
(require 'jabber-presence)
(require 'jabber-alert)
+(require 'jabber-activity)
(eval-when-compile (require 'cl-lib))
(defgroup jabber-mode-line nil
@@ -53,9 +54,6 @@ Available sections: `presence', `contacts', `activity'."
;; Activity variables (defined in jabber-activity.el)
-(declare-function jabber-activity--init "jabber-activity")
-(declare-function jabber-activity--teardown "jabber-activity")
-(declare-function jabber-activity--on-disconnect "jabber-activity")
(defvar jabber-activity-mode-string)
(defvar jabber-activity-count-in-title)
(defvar jabber-activity-count-in-title-format)
diff --git a/lisp/jabber-vcard.el b/lisp/jabber-vcard.el
index 6ee3d8feb2..4c5b9bc246 100644
--- a/lisp/jabber-vcard.el
+++ b/lisp/jabber-vcard.el
@@ -69,6 +69,7 @@
(require 'jabber-widget)
(require 'jabber-iq)
(require 'jabber-avatar)
+(require 'jabber-image)
(defconst jabber-vcard-xmlns "vcard-temp"
"XEP-0054 vCard namespace.")
@@ -80,8 +81,6 @@
(declare-function jabber-vcard-avatars-update-current
"jabber-vcard-avatars.el" (jc new-hash))
-(declare-function jabber-image-create "jabber-image"
- (data &optional mime-type max-width max-height))
(defvar jabber-vcard-fields) ; jabber-vcard.el
(defvar jabber-buffer-connection) ; jabber-chatbuffer.el
@@ -572,4 +571,4 @@ the current vCard contents."
(provide 'jabber-vcard)
-;;; jabber-vcard.el ends here
\ No newline at end of file
+;;; jabber-vcard.el ends here
