[nongnu] elpa/git-commit 12272c825d: Don't declare functions that usually are not available

[ELPA Syncer]

branch: elpa/git-commit
commit 12272c825d216148454b7cfa57fef202cdfe0c7d
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>

    Don't declare functions that usually are not available
    
    Having to silence merely the byte-compiler, is so yesterday. ;P
---
 lisp/magit-apply.el | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/lisp/magit-apply.el b/lisp/magit-apply.el
index 44ebe84e48..bd18f78acd 100644
--- a/lisp/magit-apply.el
+++ b/lisp/magit-apply.el
@@ -47,9 +47,6 @@
                   (url &optional path name args))
 (declare-function magit-submodule-read-name-for-path "magit-submodule"
                   (path &optional prefer-short))
-(declare-function borg--maybe-absorb-gitdir "borg" (pkg))
-(declare-function borg--sort-submodule-sections "borg" (file))
-(declare-function borg-assimilate "borg" (package url &optional partially))
 (defvar borg-user-emacs-directory)
 
 (cl-eval-when (compile load)
@@ -362,25 +359,27 @@ ignored) files."
         (goto-char (oref (magit-get-section
                           `((file . ,repo) (untracked) (status)))
                          start))
-        (let* ((topdir (magit-toplevel))
-               (url (let ((default-directory
-                           (file-name-as-directory (expand-file-name repo))))
-                      (or (magit-get "remote" (magit-get-some-remote) "url")
-                          (concat (file-name-as-directory ".") repo))))
-               (package
-                (and (equal (bound-and-true-p borg-user-emacs-directory)
-                            topdir)
-                     (file-name-nondirectory (directory-file-name repo)))))
-          (if (and package
-                   (y-or-n-p (format "Also assimilate `%s' drone?" package)))
-              (borg-assimilate package url)
-            (magit-submodule-add-1
-             url repo (magit-submodule-read-name-for-path repo package))
-            (when package
-              (borg--sort-submodule-sections
-               (expand-file-name ".gitmodules" topdir))
-              (let ((default-directory borg-user-emacs-directory))
-                (borg--maybe-absorb-gitdir package)))))))
+        (when (and (fboundp 'borg-assimilate)
+                   (fboundp 'borg--maybe-absorb-gitdir)
+                   (fboundp 'borg--sort-submodule-sections))
+          (let* ((topdir (magit-toplevel))
+                 (url (let ((default-directory
+                             (file-name-as-directory (expand-file-name repo))))
+                        (or (magit-get "remote" (magit-get-some-remote) "url")
+                            (concat (file-name-as-directory ".") repo))))
+                 (package
+                  (and (equal borg-user-emacs-directory topdir)
+                       (file-name-nondirectory (directory-file-name repo)))))
+            (if (and package
+                     (y-or-n-p (format "Also assimilate `%s' drone?" package)))
+                (borg-assimilate package url)
+              (magit-submodule-add-1
+               url repo (magit-submodule-read-name-for-path repo package))
+              (when package
+                (borg--sort-submodule-sections
+                 (expand-file-name ".gitmodules" topdir))
+                (let ((default-directory borg-user-emacs-directory))
+                  (borg--maybe-absorb-gitdir package))))))))
     (magit-wip-commit-after-apply files " after stage")))
 
 (defvar magit-post-stage-hook-commands