Fix a few left-over byte-comp warnings

6 files changed, 22 insertions, 8 deletions

diff --git a/cider-apropos.el b/cider-apropos.el
index b491b098..d7f40aaf 100644
--- a/cider-apropos.el
+++ b/cider-apropos.el
@@ -77,6 +77,8 @@
                    (fill-region beg (point)))))
         (newline)))))
 
+(declare-function cider-mode "cider-mode")
+
 (defun cider-show-apropos (summary results query docs-p)
   "Show SUMMARY and RESULTS for QUERY in a pop-up buffer, formatted for DOCS-P."
   (with-current-buffer (cider-popup-buffer cider-apropos-buffer t)
diff --git a/cider-interaction.el b/cider-interaction.el
index e5b55e87..17c12f0f 100644
--- a/cider-interaction.el
+++ b/cider-interaction.el
@@ -276,13 +276,7 @@ When invoked with a prefix ARG the command doesn't prompt for confirmation."
     (quit-window nil error-win)))
 
 ;;;
-(defun cider-find-var-file (var)
-  "Return the buffer visiting the file in which VAR is defined, or nil if
-not found."
-  (cider-ensure-op-supported "info")
-  (-when-let* ((info (cider-var-info var))
-               (file (nrepl-dict-get info "file")))
-    (cider-find-file file)))
+(declare-function cider-mode "cider-mode")
 
 (defun cider-jump-to (buffer &optional pos other-window)
   "Push current point onto marker ring, and jump to BUFFER and POS.
diff --git a/cider-macroexpansion.el b/cider-macroexpansion.el
index 223dff50..35d68610 100644
--- a/cider-macroexpansion.el
+++ b/cider-macroexpansion.el
@@ -158,6 +158,8 @@ and point is placed after the expanded form."
       (indent-sexp)
       (forward-sexp))))
 
+(declare-function cider-mode "cider-mode")
+
 (defun cider-create-macroexpansion-buffer ()
   "Create a new macroexpansion buffer."
   (with-current-buffer (cider-popup-buffer cider-macroexpansion-buffer t)
diff --git a/cider-mode.el b/cider-mode.el
index f95906f7..3bc8222f 100644
--- a/cider-mode.el
+++ b/cider-mode.el
@@ -82,7 +82,7 @@ entirely."
     (define-key map (kbd "C-c C-d") #'cider-doc-map)
     (define-key map (kbd "M-.") #'cider-find-var)
     (define-key map (kbd "C-c C-.") #'cider-find-ns)
-    (define-key map (kbd "M-,") #'cider-jump-back)
+    (define-key map (kbd "M-,") #'cider-pop-back)
     (define-key map (kbd "C-c M-.") #'cider-find-resource)
     (define-key map (kbd "M-TAB") #'complete-symbol)
     (define-key map (kbd "C-M-x")   #'cider-eval-defun-at-point)
diff --git a/cider-repl.el b/cider-repl.el
index 9e7866e4..d019e385 100644
--- a/cider-repl.el
+++ b/cider-repl.el
@@ -1258,6 +1258,8 @@ of the namespace in the Clojure source buffer."
   (interactive "P")
   (cider--switch-to-repl-buffer (cider-current-repl-buffer) set-namespace))
 
+(declare-function cider-load-buffer "cider-interaction")
+
 (defun cider-load-buffer-and-switch-to-repl-buffer (&optional set-namespace)
   "Load the current buffer into the relevant REPL buffer and switch to it."
   (interactive "P")
diff --git a/cider-test.el b/cider-test.el
index ee18310b..a5a19d42 100644
--- a/cider-test.el
+++ b/cider-test.el
@@ -29,6 +29,7 @@
 ;;; Code:
 
 (require 'cider-common)
+(require 'cider-client)
 (require 'cider-popup)
 (require 'cider-stacktrace)
 (require 'button)
@@ -176,6 +177,8 @@
 
 ;;; Error stacktraces
 
+(defvar cider-auto-select-error-buffer)
+
 (defun cider-test-stacktrace-for (ns var index)
   "Display stacktrace for the erring NS VAR test with the assertion INDEX."
   (let (causes)
@@ -367,6 +370,14 @@ With the actual value, the outermost '(not ...)' s-expression is removed."
               (overlay-put overlay 'expected expected)
               (overlay-put overlay 'actual actual))))))))
 
+(defun cider-find-var-file (var)
+  "Return the buffer visiting the file in which VAR is defined, or nil if
+not found."
+  (cider-ensure-op-supported "info")
+  (-when-let* ((info (cider-var-info var))
+               (file (nrepl-dict-get info "file")))
+    (cider-find-file file)))
+
 (defun cider-test-highlight-problems (ns results)
   "Highlight all non-passing tests in the NS test RESULTS."
   (nrepl-dict-map
@@ -415,6 +426,9 @@ This uses the Leiningen convention of appending '-test' to the namespace name."
 
 ;;; Test execution
 
+(declare-function cider-emit-interactive-eval-output "cider-interaction")
+(declare-function cider-emit-interactive-eval-err-output "cider-interaction")
+
 (defun cider-test-execute (ns &optional retest tests)
   "Run tests for NS; optionally RETEST failures or run only specified TESTS.
 Upon test completion, results are echoed and a test report is optionally