jessieh/eldoc-frame
jessieh/eldoc-frame
1
Fork 0
Code Issues Pull Requests Releases Activity

Preserve the old value of eldoc-display-functions (issue#74)

Browse Source 
* eldoc-box.el (eldoc-box--old-eldoc-functions): New variable.
(eldoc-box--enable): Save the old value.
(eldoc-box--disable): Check the old value.
(eldoc-box--help-at-point-last-point): Docstring change.
(eldoc-box--help-at-point-cleanup): Don't kill the local value of
eldoc-display-functions. This line is likely a remnant of the old
eglot help-at-point command and should've been removed.
This commit is contained in:
Yuan Fu 2023-05-17 14:21:48 -07:00
parent 24c216ea3a
commit ee7c978887
No known key found for this signature in database
GPG Key ID: 56E19BC57664A442
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
eldoc-box.el
View File

@ -212,6 +212,10 @@ See `eldoc-box-inhibit-display-when-moving'."
(when (and eldoc-box--frame (frame-live-p eldoc-box--frame)) (when (and eldoc-box--frame (frame-live-p eldoc-box--frame))
(make-frame-invisible eldoc-box--frame t))) (make-frame-invisible eldoc-box--frame t)))
(defvar-local eldoc-box--old-eldoc-functions nil
"The original value of ‘eldoc-display-functions’.
The original value before enabling eldoc-box.")
(defun eldoc-box--enable () (defun eldoc-box--enable ()
"Enable eldoc-box hover. "Enable eldoc-box hover.
Intended for internal use." Intended for internal use."
@ -219,6 +223,8 @@ Intended for internal use."
(add-function :before-while (local 'eldoc-message-function) (add-function :before-while (local 'eldoc-message-function)
#'eldoc-box--eldoc-message-function) #'eldoc-box--eldoc-message-function)
(setq-local eldoc-box--old-eldoc-functions
eldoc-display-functions)
(setq-local eldoc-display-functions (setq-local eldoc-display-functions
(cons 'eldoc-box--eldoc-display-function (cons 'eldoc-box--eldoc-display-function
(remq 'eldoc-display-in-echo-area (remq 'eldoc-display-in-echo-area
@ -234,12 +240,18 @@ Intended for internal use."
(remove-function (local 'eldoc-message-function) #'eldoc-box--eldoc-message-function) (remove-function (local 'eldoc-message-function) #'eldoc-box--eldoc-message-function)
(setq-local eldoc-display-functions (setq-local eldoc-display-functions
(cons 'eldoc-display-in-echo-area
(remq 'eldoc-box--eldoc-display-function (remq 'eldoc-box--eldoc-display-function
eldoc-display-functions))
;; If we removed eldoc-display-in-echo-area when enabling
;; eldoc-box, add it back.
(when (memq 'eldoc-display-in-echo-area
eldoc-box--old-eldoc-functions)
(setq-local eldoc-display-functions
(cons 'eldoc-display-in-echo-area
eldoc-display-functions)))) eldoc-display-functions))))
(advice-remove #'keyboard-quit #'eldoc-box-quit-frame) (advice-remove #'keyboard-quit #'eldoc-box-quit-frame)
;; If minor mode is turned off when childframe is visible, hide it. ;; If minor mode is turned off when the childframe is visible, hide it.
(when eldoc-box--frame (when eldoc-box--frame
(delete-frame eldoc-box--frame) (delete-frame eldoc-box--frame)
(setq eldoc-box--frame nil))) (setq eldoc-box--frame nil)))
@ -247,17 +259,16 @@ Intended for internal use."
;;;;; Help at point ;;;;; Help at point
(defvar eldoc-box--help-at-point-last-point 0 (defvar eldoc-box--help-at-point-last-point 0
"This point cache is used by clean up function. "This point cache is used by the clean up function.
If (point) != last point, cleanup frame.") If point != last point, hide the childframe.")
(defun eldoc-box--help-at-point-cleanup () (defun eldoc-box--help-at-point-cleanup ()
"Try to clean up the childframe made by eldoc-box hack." "Try to clean up the childframe."
(if (or (eq (point) eldoc-box--help-at-point-last-point) (if (or (eq (point) eldoc-box--help-at-point-last-point)
;; don't clean up when the user clicks childframe ;; Don't clean up when the user clicks into the childframe.
(eq (selected-frame) eldoc-box--frame)) (eq (selected-frame) eldoc-box--frame))
(run-with-timer 0.1 nil #'eldoc-box--help-at-point-cleanup) (run-with-timer 0.1 nil #'eldoc-box--help-at-point-cleanup)
(eldoc-box-quit-frame) (eldoc-box-quit-frame)))
(kill-local-variable 'eldoc-display-functions)))
;;;###autoload ;;;###autoload
(defun eldoc-box-help-at-point () (defun eldoc-box-help-at-point ()