emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/corfu 70d85b1193 4/6: Remove corfu-docframe--teardown


From: ELPA Syncer
Subject: [elpa] externals/corfu 70d85b1193 4/6: Remove corfu-docframe--teardown
Date: Thu, 17 Nov 2022 23:57:32 -0500 (EST)

branch: externals/corfu
commit 70d85b1193ae843beedb2aa422173156023bad54
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    Remove corfu-docframe--teardown
---
 extensions/corfu-docframe.el | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/extensions/corfu-docframe.el b/extensions/corfu-docframe.el
index d36ef132e0..c3ed339027 100644
--- a/extensions/corfu-docframe.el
+++ b/extensions/corfu-docframe.el
@@ -301,11 +301,6 @@ the corfu popup, its value is 'bottom, 'top, 'right or 
'left."
   "Clear the doc popup buffer content and hide it."
   (corfu--hide-frame corfu-docframe--frame))
 
-(defun corfu-docframe--teardown ()
-  "Teardown the docframe state."
-  (corfu-docframe--hide)
-  (mapc #'kill-local-variable corfu-docframe--state-vars))
-
 (defun corfu-docframe-scroll-up (&optional n)
   "Scroll text of doc popup window upward N lines.
 
@@ -360,11 +355,16 @@ not be displayed until this command is called again, even 
if
   :global t :group 'corfu
   (cond
    (corfu-docframe-mode
+    ;; TODO seq-union (Emacs 28, seq compatibility package?)
+    (setq corfu--state-vars (seq-uniq (append corfu--state-vars
+                                              corfu-docframe--state-vars)))
     (advice-add #'corfu--exhibit :after #'corfu-docframe--exhibit)
-    (advice-add #'corfu--teardown :before #'corfu-docframe--teardown))
+    (advice-add #'corfu--teardown :before #'corfu-docframe--hide))
    (t
+    (setq corfu--state-vars (seq-difference corfu--state-vars
+                                            corfu-docframe--state-vars))
     (advice-remove #'corfu--exhibit #'corfu-docframe--exhibit)
-    (advice-remove #'corfu--teardown #'corfu-docframe--teardown))))
+    (advice-remove #'corfu--teardown #'corfu-docframe--hide))))
 
 (provide 'corfu-docframe)
 ;;; corfu-docframe.el ends here



reply via email to

[Prev in Thread] Current Thread [Next in Thread]