[elpa] externals/corfu 31f2835706 02/12: Shorten the name of the corfu-docframe extension

[ELPA Syncer]

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

    Shorten the name of the corfu-docframe extension
---
 README.org                                         |   9 +-
 .../{corfu-doc-popup.el => corfu-docframe.el}      | 291 +++++++++++----------
 2 files changed, 153 insertions(+), 147 deletions(-)

diff --git a/README.org b/README.org
index f879f24c7d..1f2ef8daa2 100644
--- a/README.org
+++ b/README.org
@@ -445,9 +445,12 @@ be enabled manually if desired. Furthermore it is possible 
to install all of the
 files separately, both ~corfu.el~ and the ~corfu-*.el~ extensions. Currently 
the
 following extensions come with the Corfu ELPA package:
 
-- 
[[https://github.com/minad/corfu/blob/main/extensions/corfu-doc-popup.el][corfu-doc-popup]]:
 Display candidate documentation in a popup.
-- 
[[https://github.com/minad/corfu/blob/main/extensions/corfu-history.el][corfu-history]]:
 =corfu-history-mode= to remember selected candidates and to improve sorting.
-- 
[[https://github.com/minad/corfu/blob/main/extensions/corfu-indexed.el][corfu-indexed]]:
 =corfu-indexed-mode= to select indexed candidates with prefix arguments.
+- 
[[https://github.com/minad/corfu/blob/main/extensions/corfu-docframe.el][corfu-docframe]]:
 Display candidate documentation in a popup frame next to the
+  candidate menu.
+- 
[[https://github.com/minad/corfu/blob/main/extensions/corfu-history.el][corfu-history]]:
 =corfu-history-mode= remembers selected candidates and sorts the
+  candidates by their history position.
+- 
[[https://github.com/minad/corfu/blob/main/extensions/corfu-indexed.el][corfu-indexed]]:
 =corfu-indexed-mode= allows you to select indexed candidates with
+  prefix arguments.
 - 
[[https://github.com/minad/corfu/blob/main/extensions/corfu-info.el][corfu-info]]:
 Actions to access the candidate location and documentation.
 - 
[[https://github.com/minad/corfu/blob/main/extensions/corfu-quick.el][corfu-quick]]:
 Commands to select using Avy-style quick keys.
 
diff --git a/extensions/corfu-doc-popup.el b/extensions/corfu-docframe.el
similarity index 64%
rename from extensions/corfu-doc-popup.el
rename to extensions/corfu-docframe.el
index 700afc3c99..2aeb670f4f 100644
--- a/extensions/corfu-doc-popup.el
+++ b/extensions/corfu-docframe.el
@@ -1,4 +1,4 @@
-;;; corfu-doc-popup.el --- Documentation popup for Corfu -*- lexical-binding: 
t -*-
+;;; corfu-docframe.el --- Documentation popup for Corfu -*- lexical-binding: t 
-*-
 
 ;; Copyright (C) 2021-2022  Free Software Foundation, Inc.
 
@@ -28,6 +28,9 @@
 ;;; Commentary:
 
 ;; Display a documentation popup for completion candidate when using Corfu.
+;;
+;; Enable `corfu-docframe-mode':
+;;   (add-hook 'corfu-mode-hook #'corfu-docframe-mode).
 
 ;;; Code:
 
@@ -35,12 +38,12 @@
 (eval-when-compile
   (require 'subr-x))
 
-(defcustom corfu-doc-popup-auto t
+(defcustom corfu-docframe-auto t
   "Display documentation popup automatically."
   :group 'corfu
   :type 'boolean)
 
-(defcustom corfu-doc-popup-delay 1.0
+(defcustom corfu-docframe-delay 1.0
   "The number of seconds to wait before displaying the documentation popup.
 
 The value of nil means no delay."
@@ -49,32 +52,32 @@ The value of nil means no delay."
           (const :tag "immediate (0)" 0)
           (number :tag "seconds")))
 
-(defcustom corfu-doc-popup-hide t
+(defcustom corfu-docframe-hide t
   "Hide the popup during the transition between candidates."
   :group 'corfu
   :type 'boolean)
 
-(defcustom corfu-doc-popup-max-width 80
+(defcustom corfu-docframe-max-width 80
   "The max width of the corfu doc popup in characters."
   :group 'corfu
   :type 'integer)
 
-(defcustom corfu-doc-popup-max-height 10
+(defcustom corfu-docframe-max-height 10
   "The max height of the corfu doc popup in characters."
   :group 'corfu
   :type 'integer)
 
-(defcustom corfu-doc-popup-resize-frame t
+(defcustom corfu-docframe-resize-frame t
   "Non-nil means resize the corfu doc popup automatically.
 
 If this is nil, do not resize corfu doc popup automatically."
   :group 'corfu
   :type 'boolean)
 
-(defvar corfu-doc-popup--frame nil
+(defvar corfu-docframe--frame nil
   "Doc frame.")
 
-(defvar corfu-doc-popup--frame-parameters
+(defvar corfu-docframe--frame-parameters
   (let* ((cw (default-font-width))
          (lmw (* cw corfu-left-margin-width))
          (rmw (* cw corfu-right-margin-width))
@@ -84,13 +87,13 @@ If this is nil, do not resize corfu doc popup 
automatically."
     fp)
   "Default doc child frame parameters.")
 
-(defvar corfu-doc-popup--auto-timer nil
+(defvar corfu-docframe--auto-timer nil
   "Corfu doc popup auto display timer.")
 
-(defvar-local corfu-doc-popup--candidate nil
+(defvar-local corfu-docframe--candidate nil
   "Completion candidate for the doc popup.")
 
-(defvar-local corfu-doc-popup--cf-popup-edges nil
+(defvar-local corfu-docframe--cf-popup-edges nil
   "Coordinates of the corfu popup's edges.
 
 The coordinates list has the form (LEFT TOP RIGHT BOTTOM) where all
@@ -100,25 +103,25 @@ relative to LEFT and TOP which are both zero.
 
 See `frame-edges' for details.")
 
-(defvar corfu-doc-popup--cf-window nil
+(defvar corfu-docframe--cf-window nil
   "Window where the corfu popup is located.")
 
-(defvar-local corfu-doc-popup--direction nil
+(defvar-local corfu-docframe--direction nil
   "Position direction of the doc popup relative to the corfu popup.")
 
-(defconst corfu-doc-popup--state-vars
-  '(corfu-doc-popup--candidate
-    corfu-doc-popup--cf-popup-edges
-    corfu-doc-popup--cf-window
-    corfu-doc-popup--direction)
-  "Buffer-local state variables used by corfu-doc-popup.")
+(defconst corfu-docframe--state-vars
+  '(corfu-docframe--candidate
+    corfu-docframe--cf-popup-edges
+    corfu-docframe--cf-window
+    corfu-docframe--direction)
+  "Buffer-local state variables used by corfu-docframe.")
 
-(defun corfu-doc-popup--visible-p ()
+(defun corfu-docframe--visible-p ()
   "Determine whether the doc popup is visible."
-  (and (frame-live-p corfu-doc-popup--frame)
-       (frame-visible-p corfu-doc-popup--frame)))
+  (and (frame-live-p corfu-docframe--frame)
+       (frame-visible-p corfu-docframe--frame)))
 
-(defun corfu-doc-popup--get-doc ()
+(defun corfu-docframe--get-doc ()
   "Get the documentation for the current completion candidate.
 
 The documentation is trimmed.
@@ -145,19 +148,19 @@ Returns nil if an error occurs or the documentation 
content is empty."
     (unless (string-empty-p (string-trim doc))
       doc)))
 
-(defun corfu-doc-popup--size (&optional width height)
+(defun corfu-docframe--size (&optional width height)
   "Calculate popup size in the form of (width height).
 
 If WIDTH and HEIGHT is speicified, just return (WIDTH HEIGHT)."
-  (let ((max-width (* (frame-char-width) corfu-doc-popup-max-width))
-        (max-height (* (frame-char-height) corfu-doc-popup-max-height)))
+  (let ((max-width (* (frame-char-width) corfu-docframe-max-width))
+        (max-height (* (frame-char-height) corfu-docframe-max-height)))
     (if (and width height)
         (list (min width max-width) (min height max-height))
       (pcase-let*
-          ((lfw (alist-get 'left-fringe corfu-doc-popup--frame-parameters))
-           (rfw (alist-get 'right-fringe corfu-doc-popup--frame-parameters))
+          ((lfw (alist-get 'left-fringe corfu-docframe--frame-parameters))
+           (rfw (alist-get 'right-fringe corfu-docframe--frame-parameters))
            (`(,popup-width ,popup-height)
-             (if (not corfu-doc-popup-resize-frame)
+             (if (not corfu-docframe-resize-frame)
                  (list (or width
                            ;; left margin + inner width + right margin
                            (+ lfw max-width rfw))
@@ -165,17 +168,17 @@ If WIDTH and HEIGHT is speicified, just return (WIDTH 
HEIGHT)."
                (pcase-let
                    ((`(,win-width . ,win-height)
                       (save-window-excursion
-                        (with-current-buffer " *corfu-doc-popup*"
+                        (with-current-buffer " *corfu-docframe*"
                           (set-window-dedicated-p nil nil)
                           (set-window-buffer nil (current-buffer))
                           (window-text-pixel-size
                            nil (point-min) (point-max)
-                           (* (default-font-width) corfu-doc-popup-max-width)
-                           (* (default-line-height) 
corfu-doc-popup-max-height))))))
+                           (* (default-font-width) corfu-docframe-max-width)
+                           (* (default-line-height) 
corfu-docframe-max-height))))))
                  (list (or width win-width) (or height win-height))))))
         (list (min popup-width max-width) (min popup-height max-height))))))
 
-(defun corfu-doc-popup--frame-geometry (&optional frame)
+(defun corfu-docframe--frame-geometry (&optional frame)
   "Return position and size geometric attributes of FRAME.
 
 The geometry represents the position and size in pixels
@@ -186,7 +189,7 @@ FRAME must be a live frame and defaults to the selected 
one."
       ((`(,x . ,y) (frame-position frame)))
     (list x y (frame-pixel-width frame) (frame-pixel-height frame))))
 
-(defun corfu-doc-popup--display-area-horizontal (width height)
+(defun corfu-docframe--display-area-horizontal (width height)
   "Calculate the horizontal display area for the doc popup.
 
 The WIDTH and HEIGHT of the doc popup are in pixels.
@@ -197,14 +200,14 @@ relative to the corfu popup, its value can be 'right or 
'left."
   (pcase-let*
       ((a-x 0) (a-y 0) (a-width width) (a-height height) (a-direction 'right)
        (border
-        (alist-get 'child-frame-border-width 
corfu-doc-popup--frame-parameters))
+        (alist-get 'child-frame-border-width corfu-docframe--frame-parameters))
        ;; space between candidates popup and doc popup
        (space (- border))  ;; share the border
-       (lfw (alist-get 'left-fringe corfu-doc-popup--frame-parameters))
-       (rfw (alist-get 'right-fringe corfu-doc-popup--frame-parameters))
+       (lfw (alist-get 'left-fringe corfu-docframe--frame-parameters))
+       (rfw (alist-get 'right-fringe corfu-docframe--frame-parameters))
        (`(,_pfx ,_pfy ,pfw ,_pfh)
-         (corfu-doc-popup--frame-geometry (frame-parent corfu--frame)))
-       (`(,cfx ,cfy ,cfw ,_cfh) (corfu-doc-popup--frame-geometry corfu--frame))
+         (corfu-docframe--frame-geometry (frame-parent corfu--frame)))
+       (`(,cfx ,cfy ,cfw ,_cfh) (corfu-docframe--frame-geometry corfu--frame))
        (x-on-right (+ cfx cfw space))
        ;; width remaining right
        (w-remaining-right (- pfw 1 x-on-right border lfw rfw border))
@@ -234,7 +237,7 @@ relative to the corfu popup, its value can be 'right or 
'left."
     (setq a-y cfy)
     (list a-x a-y a-width a-height a-direction)))
 
-(defun corfu-doc-popup--display-area-vertical (width height)
+(defun corfu-docframe--display-area-vertical (width height)
   "Calculate the vertical display area for the doc popup.
 
 The WIDTH and HEIGHT of the doc popup are in pixels.
@@ -246,14 +249,14 @@ relative to the corfu popup, its value can be 'bottom or 
'top."
       ((a-x 0) (a-y 0) (a-height height) (a-direction 'bottom)
        (border
         (alist-get 'child-frame-border-width
-                   corfu-doc-popup--frame-parameters))
+                   corfu-docframe--frame-parameters))
        (space (- border))
-       (lfw (alist-get 'left-fringe corfu-doc-popup--frame-parameters))
-       (rfw (alist-get 'right-fringe corfu-doc-popup--frame-parameters))
+       (lfw (alist-get 'left-fringe corfu-docframe--frame-parameters))
+       (rfw (alist-get 'right-fringe corfu-docframe--frame-parameters))
        (lh (default-line-height))
        (`(,_pfx ,_pfy ,pfw ,pfh)
-         (corfu-doc-popup--frame-geometry (frame-parent corfu--frame)))
-       (`(,cfx ,cfy ,_cfw ,cfh) (corfu-doc-popup--frame-geometry corfu--frame))
+         (corfu-docframe--frame-geometry (frame-parent corfu--frame)))
+       (`(,cfx ,cfy ,_cfw ,cfh) (corfu-docframe--frame-geometry corfu--frame))
        (cf-on-cursor-bottom-p
         (>= cfy
             (+ (cadr (window-inside-pixel-edges))
@@ -277,7 +280,7 @@ relative to the corfu popup, its value can be 'bottom or 
'top."
     (setq a-x cfx)
     (list a-x a-y a-width a-height a-direction)))
 
-(defun corfu-doc-popup--display-area (&optional direction width height)
+(defun corfu-docframe--display-area (&optional direction width height)
   "Calculate the display area for the doc popup.
 
 If DIRECTION is specified, the display area in the corresponding direction
@@ -291,27 +294,27 @@ DIRECTION indicates the position direction of the doc 
popup relative to
 the corfu popup, its value is 'bottom, 'top, 'right or 'left."
   (cond
     ((member direction '(right left))
-     (apply #'corfu-doc-popup--display-area-horizontal
-            (corfu-doc-popup--size)))
+     (apply #'corfu-docframe--display-area-horizontal
+            (corfu-docframe--size)))
     ((member direction '(bottom top))
-     (apply #'corfu-doc-popup--display-area-vertical
-            (corfu-doc-popup--size)))
+     (apply #'corfu-docframe--display-area-vertical
+            (corfu-docframe--size)))
     (t
      (pcase-let*
          ((`(,width ,height)  ;; popup inner width and height
-            (corfu-doc-popup--size width height))
+            (corfu-docframe--size width height))
           (`(,v-x ,v-y ,v-w ,v-h ,v-d)
-            (corfu-doc-popup--display-area-vertical width height)))
+            (corfu-docframe--display-area-vertical width height)))
        (if (and (>= v-h height) (>= v-w width))
            (list v-x v-y v-w v-h v-d)
          (pcase-let
              ((`(,h-x ,h-y ,h-w ,h-h ,h-d)
-                (corfu-doc-popup--display-area-horizontal width height)))
+                (corfu-docframe--display-area-horizontal width height)))
            (if (>= (* v-w v-h) (* h-w h-h))
                (list v-x v-y v-w v-h v-d)
              (list h-x h-y h-w h-h h-d))))))))
 
-(defun corfu-doc-popup--show (&optional candidate candidate-index)
+(defun corfu-docframe--show (&optional candidate candidate-index)
   "Show the doc popup.
 
 The optional CANDIDATE is the completion candidate for the doc popup.
@@ -328,169 +331,169 @@ it should be compared with the value recorded by 
`corfu--index'."
       (setq candidate (and (> corfu--total 0) (>= corfu--index 0)
                            (nth corfu--index corfu--candidates))))
     (if (not candidate)
-        (corfu-doc-popup--hide)
+        (corfu-docframe--hide)
       (let ((should-update-doc-p
-              (not (string= candidate corfu-doc-popup--candidate)))
+              (not (string= candidate corfu-docframe--candidate)))
             doc-updated-p
             ;; check if the coordinates of the corfu popup have changed
             (cfp-edges-changed-p
               (not (equal (frame-edges corfu--frame 'inner-edges)
-                          corfu-doc-popup--cf-popup-edges))))
+                          corfu-docframe--cf-popup-edges))))
         (if (not should-update-doc-p)
             (when (and (not (string-empty-p
                              (string-trim
-                              (with-current-buffer " *corfu-doc-popup*"
+                              (with-current-buffer " *corfu-docframe*"
                                 (buffer-string)))))
-                       (not (corfu-doc-popup--visible-p)))
-              (make-frame-visible corfu-doc-popup--frame))
-          (if-let* ((doc (corfu-doc-popup--get-doc)))
+                       (not (corfu-docframe--visible-p)))
+              (make-frame-visible corfu-docframe--frame))
+          (if-let* ((doc (corfu-docframe--get-doc)))
               (progn
                 ;; turn on word wrap and hide fringe indicators
                 (with-current-buffer
-                    (corfu--make-buffer " *corfu-doc-popup*" doc)
+                    (corfu--make-buffer " *corfu-docframe*" doc)
                   (setq-local line-move-visual t)
                   (setq-local truncate-partial-width-windows nil)
                   (setq truncate-lines nil
                         word-wrap t
                         fringe-indicator-alist `(,(cons 'continuation nil))))
                 (setq doc-updated-p t))
-            (corfu-doc-popup--hide)))
+            (corfu-docframe--hide)))
         (when (or (and (not should-update-doc-p) cfp-edges-changed-p)
                   doc-updated-p)
           (pcase-let
               ((`(,area-x ,area-y ,area-w ,area-h ,area-d)
                  (apply
-                  #'corfu-doc-popup--display-area
-                  corfu-doc-popup--direction
+                  #'corfu-docframe--display-area
+                  corfu-docframe--direction
                   (when (not should-update-doc-p)
                     (let ((border
                             (alist-get 'child-frame-border-width
-                                       corfu-doc-popup--frame-parameters)))
-                      (list (- (frame-pixel-width corfu-doc-popup--frame)
+                                       corfu-docframe--frame-parameters)))
+                      (list (- (frame-pixel-width corfu-docframe--frame)
                                border border)
-                            (- (frame-pixel-height corfu-doc-popup--frame)
+                            (- (frame-pixel-height corfu-docframe--frame)
                                border border)))))))
-            (setq corfu-doc-popup--frame
-                  (corfu--make-frame corfu-doc-popup--frame
-                                     corfu-doc-popup--frame-parameters
+            (setq corfu-docframe--frame
+                  (corfu--make-frame corfu-docframe--frame
+                                     corfu-docframe--frame-parameters
                                      area-x area-y area-w area-h
-                                     (get-buffer " *corfu-doc-popup*"))
-                  corfu-doc-popup--direction area-d)))
+                                     (get-buffer " *corfu-docframe*"))
+                  corfu-docframe--direction area-d)))
         (if doc-updated-p
-            (setq corfu-doc-popup--candidate candidate
-                  corfu-doc-popup--cf-popup-edges
+            (setq corfu-docframe--candidate candidate
+                  corfu-docframe--cf-popup-edges
                   (frame-edges corfu--frame 'inner-edges)
-                  corfu-doc-popup--cf-window (selected-window))
+                  corfu-docframe--cf-window (selected-window))
           (when cfp-edges-changed-p
-            (setq corfu-doc-popup--cf-popup-edges
+            (setq corfu-docframe--cf-popup-edges
                   (frame-edges corfu--frame 'inner-edges))))))))
 
-(defun corfu-doc-popup--hide ()
+(defun corfu-docframe--hide ()
   "Clear the doc popup buffer content and hide it."
-  (corfu--hide-frame corfu-doc-popup--frame))
+  (corfu--hide-frame corfu-docframe--frame))
 
-(defun corfu-doc-popup--transition ()
+(defun corfu-docframe--transition ()
   "Transition when updating the doc popup."
-  (when (corfu-doc-popup--visible-p)
-    (when (and (not (null corfu-doc-popup-delay))
-               (> corfu-doc-popup-delay 0))
-      (if corfu-doc-popup-hide
-          (corfu--hide-frame corfu-doc-popup--frame)
-        (corfu-doc-popup--show corfu-doc-popup--candidate)))))
-
-(defun corfu-doc-popup-scroll-up (&optional n)
+  (when (corfu-docframe--visible-p)
+    (when (and (not (null corfu-docframe-delay))
+               (> corfu-docframe-delay 0))
+      (if corfu-docframe-hide
+          (corfu--hide-frame corfu-docframe--frame)
+        (corfu-docframe--show corfu-docframe--candidate)))))
+
+(defun corfu-docframe-scroll-up (&optional n)
   "Scroll text of doc popup window upward N lines.
 
 If ARG is omitted or nil, scroll upward by a near full screen.
 See `scroll-up' for details."
   (interactive "p")
-  (when-let ((cf-doc-buf (and (corfu-doc-popup--visible-p)
-                              (get-buffer " *corfu-doc-popup*"))))
-    (with-selected-frame corfu-doc-popup--frame
+  (when-let ((cf-doc-buf (and (corfu-docframe--visible-p)
+                              (get-buffer " *corfu-docframe*"))))
+    (with-selected-frame corfu-docframe--frame
       (with-current-buffer cf-doc-buf
         (scroll-up n)))))
 
-(defun corfu-doc-popup-scroll-down (&optional n)
+(defun corfu-docframe-scroll-down (&optional n)
   "Scroll text of doc popup window down N lines.
 
 If ARG is omitted or nil, scroll down by a near full screen."
   (interactive "p")
-  (corfu-doc-popup-scroll-up (- (or n 1))))
+  (corfu-docframe-scroll-up (- (or n 1))))
 
 ;;;###autoload
-(define-minor-mode corfu-doc-popup-mode
+(define-minor-mode corfu-docframe-mode
   "Corfu doc popup minor mode."
   :global nil
   :group 'corfu
   (cond
-    (corfu-doc-popup-mode
-     (corfu-doc-popup--show)
-     (add-hook 'completion-in-region-mode-hook #'corfu-doc-popup--setup))
+    (corfu-docframe-mode
+     (corfu-docframe--show)
+     (add-hook 'completion-in-region-mode-hook #'corfu-docframe--setup))
     (t
-     (corfu-doc-popup--teardown)
-     (remove-hook 'completion-in-region-mode-hook #'corfu-doc-popup--setup))))
+     (corfu-docframe--teardown)
+     (remove-hook 'completion-in-region-mode-hook #'corfu-docframe--setup))))
 
-(defun corfu-doc-popup-toggle ()
+(defun corfu-docframe-toggle ()
   "Toggle the doc popup display or hide.
 
 When using this command to manually hide the doc popup, it will
 not be displayed until this command is called again. Even if the
-corfu doc mode is turned on and `corfu-doc-popup-auto' is set to Non-nil."
+corfu doc mode is turned on and `corfu-docframe-auto' is set to Non-nil."
   (interactive)
-  (when corfu-doc-popup-mode
-    (if (corfu-doc-popup--visible-p)
+  (when corfu-docframe-mode
+    (if (corfu-docframe--visible-p)
         (progn
-          (corfu-doc-popup--teardown)
+          (corfu-docframe--teardown)
           (remove-hook 'completion-in-region-mode-hook
-                       #'corfu-doc-popup--setup))
-      (corfu-doc-popup--show)
-      (corfu-doc-popup--setup)
-      (add-hook 'completion-in-region-mode-hook #'corfu-doc-popup--setup))))
+                       #'corfu-docframe--setup))
+      (corfu-docframe--show)
+      (corfu-docframe--setup)
+      (add-hook 'completion-in-region-mode-hook #'corfu-docframe--setup))))
 
-(defun corfu-doc-popup--post-command ()
+(defun corfu-docframe--post-command ()
   "Update the doc popup after last command."
   (when corfu-preselect-first
-    (advice-remove 'corfu--exhibit #'corfu-doc-popup--cf-exhibit-after-advice))
+    (advice-remove 'corfu--exhibit #'corfu-docframe--cf-exhibit-after-advice))
   (when (and (frame-live-p corfu--frame)
              (frame-visible-p corfu--frame))
     (if-let ((candidate
               (and (> corfu--total 0) (>= corfu--index 0)
                    (nth corfu--index corfu--candidates))))
         (progn
-          (when corfu-doc-popup--auto-timer
-            (cancel-timer corfu-doc-popup--auto-timer)
-            (setq corfu-doc-popup--auto-timer nil))
-          (if (and (string= candidate corfu-doc-popup--candidate)
-                   (eq (selected-window) corfu-doc-popup--cf-window)
-                   (frame-live-p corfu-doc-popup--frame))
-              (corfu-doc-popup--show candidate)
-            (corfu-doc-popup--transition)
-            (setq corfu-doc-popup--auto-timer
+          (when corfu-docframe--auto-timer
+            (cancel-timer corfu-docframe--auto-timer)
+            (setq corfu-docframe--auto-timer nil))
+          (if (and (string= candidate corfu-docframe--candidate)
+                   (eq (selected-window) corfu-docframe--cf-window)
+                   (frame-live-p corfu-docframe--frame))
+              (corfu-docframe--show candidate)
+            (corfu-docframe--transition)
+            (setq corfu-docframe--auto-timer
                   (run-with-timer
-                   corfu-doc-popup-delay nil
-                   #'corfu-doc-popup--show nil corfu--index))))
-      (corfu-doc-popup--hide))))
+                   corfu-docframe-delay nil
+                   #'corfu-docframe--show nil corfu--index))))
+      (corfu-docframe--hide))))
 
-(defun corfu-doc-popup--cf-exhibit-after-advice (&rest _args)
+(defun corfu-docframe--cf-exhibit-after-advice (&rest _args)
   "After advice for `corfu--exhibit'.
 To display the doc popup for the preselected completion candidate."
   (when (and corfu--candidates (>= corfu--index 0))
-    (corfu-doc-popup--post-command)))
+    (corfu-docframe--post-command)))
 
-(defun corfu-doc-popup--setup ()
-  "Setup corfu-doc-popup."
+(defun corfu-docframe--setup ()
+  "Setup corfu-docframe."
   (if (not completion-in-region-mode)
-      (corfu-doc-popup--teardown)
-    (when corfu-doc-popup-mode
-      (if corfu-doc-popup-auto
+      (corfu-docframe--teardown)
+    (when corfu-docframe-mode
+      (if corfu-docframe-auto
           (progn
             ;; display the doc popup for the preselected first candidate
             (when corfu-preselect-first
               (advice-add 'corfu--exhibit :after
-                          #'corfu-doc-popup--cf-exhibit-after-advice))
-            (add-hook 'post-command-hook #'corfu-doc-popup--post-command
+                          #'corfu-docframe--cf-exhibit-after-advice))
+            (add-hook 'post-command-hook #'corfu-docframe--post-command
                       'append 'local))
-        (let ((sym (make-symbol "corfu-doc-popup--teardown"))
+        (let ((sym (make-symbol "corfu-docframe--teardown"))
               (buf (current-buffer)))
           (fset sym
                 (lambda ()
@@ -499,21 +502,21 @@ To display the doc popup for the preselected completion 
candidate."
                                (nth corfu--index corfu--candidates))))
                     (unless
                         (and completion-in-region-mode
-                             (string= candidate corfu-doc-popup--candidate)
-                             (eq (selected-window) corfu-doc-popup--cf-window)
-                             (frame-live-p corfu-doc-popup--frame))
+                             (string= candidate corfu-docframe--candidate)
+                             (eq (selected-window) corfu-docframe--cf-window)
+                             (frame-live-p corfu-docframe--frame))
                       (remove-hook 'post-command-hook sym 'local)
                       (with-current-buffer (if (buffer-live-p buf)
                                                buf
                                              (current-buffer))
-                        (corfu-doc-popup--teardown))))))
+                        (corfu-docframe--teardown))))))
           (add-hook 'post-command-hook sym 'append 'local))))))
 
-(defun corfu-doc-popup--teardown ()
-  "Teardown corfu-doc-popup."
-  (remove-hook 'post-command-hook #'corfu-doc-popup--post-command 'local)
-  (corfu-doc-popup--hide)
-  (mapc #'kill-local-variable corfu-doc-popup--state-vars))
+(defun corfu-docframe--teardown ()
+  "Teardown corfu-docframe."
+  (remove-hook 'post-command-hook #'corfu-docframe--post-command 'local)
+  (corfu-docframe--hide)
+  (mapc #'kill-local-variable corfu-docframe--state-vars))
 
-(provide 'corfu-doc-popup)
-;;; corfu-doc-popup.el ends here
+(provide 'corfu-docframe)
+;;; corfu-docframe.el ends here