Do not require eglot at compile time

This fixes #46, reverts c18023132d.
Moved eglot-related functions into a
(eval-and-compile (when (require 'eglot nil t))) form.

* eldoc-box.el (require): Remove eglot requires.
This commit is contained in:
Yuan Fu 2022-05-05 17:22:23 -07:00
parent 6c3107aa69
commit b90780c93c
No known key found for this signature in database
GPG Key ID: 56E19BC57664A442

View File

@ -40,11 +40,6 @@
(require 'cl-lib) (require 'cl-lib)
(require 'seq) (require 'seq)
;; https://www.gnu.org/software/emacs/manual/html_node/elisp/Compiling-Macros.html
(eval-when-compile
(require 'jsonrpc)
(require 'eglot))
;;;; Userland ;;;; Userland
;;;;; Variable ;;;;; Variable
(defgroup eldoc-box nil (defgroup eldoc-box nil
@ -451,6 +446,9 @@ You can use \[keyboard-quit] to hide the doc."
;;;; Eglot helper ;;;; Eglot helper
(eval-and-compile
(require 'jsonrpc)
(when (require 'eglot nil t)
(defvar eldoc-box-eglot-help-at-point-last-point 0 (defvar eldoc-box-eglot-help-at-point-last-point 0
"This point cache is used by clean up function. "This point cache is used by clean up function.
If (point) != last point, cleanup frame.") If (point) != last point, cleanup frame.")
@ -487,7 +485,7 @@ If (point) != last point, cleanup frame.")
(eldoc-box--display hover-info) (eldoc-box--display hover-info)
(eglot--error "No hover info here")))) (eglot--error "No hover info here"))))
(setq eldoc-box-eglot-help-at-point-last-point (point)) (setq eldoc-box-eglot-help-at-point-last-point (point))
(run-with-timer 0.1 nil #'eldoc-box--eglot-help-at-point-cleanup))) (run-with-timer 0.1 nil #'eldoc-box--eglot-help-at-point-cleanup)))))
;;;; Comany compatibility ;;;; Comany compatibility
;; ;;