[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/vertico e20762fbc5 1/3: vertico-suspend: Adapt to verti
From: |
ELPA Syncer |
Subject: |
[elpa] externals/vertico e20762fbc5 1/3: vertico-suspend: Adapt to vertico-buffer changes, Simplify |
Date: |
Tue, 26 Dec 2023 15:58:43 -0500 (EST) |
branch: externals/vertico
commit e20762fbc5afe8710c5cfc22ec0502957ff16de7
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
vertico-suspend: Adapt to vertico-buffer changes, Simplify
---
extensions/vertico-suspend.el | 24 +++++++++---------------
1 file changed, 9 insertions(+), 15 deletions(-)
diff --git a/extensions/vertico-suspend.el b/extensions/vertico-suspend.el
index eb096ce5bf..33052a7d31 100644
--- a/extensions/vertico-suspend.el
+++ b/extensions/vertico-suspend.el
@@ -55,7 +55,9 @@
(require 'vertico)
-(defvar-local vertico-suspend--wc nil)
+(defvar vertico-buffer--restore)
+(declare-function vertico-buffer-mode "ext:vertico-buffer")
+
(defvar-local vertico-suspend--ov nil)
;;;###autoload
@@ -79,15 +81,9 @@ or the latest completion session is restored."
(overlay-put vertico--candidates-ov 'before-string nil)
(overlay-put vertico--candidates-ov 'after-string nil)
(set-window-parameter win 'no-other-window t)
- ;; vertico-buffer handling
- (when (memq 'vertico-buffer--redisplay pre-redisplay-functions)
- (remove-hook 'pre-redisplay-functions 'vertico-buffer--redisplay
'local)
- (setq-local cursor-in-non-selected-windows nil
- vertico-suspend--wc (current-window-configuration))
- (dolist (w (get-buffer-window-list buf))
- (unless (eq w win)
- (delete-window w)))
- (set-window-vscroll nil 0))
+ (when (bound-and-true-p vertico-buffer-mode)
+ (vertico-buffer-mode -1)
+ (setq vertico-buffer--restore #'ignore))
(unless (frame-root-window-p win)
(window-resize win (- (window-pixel-height win)) nil nil 'pixelwise))
(other-window 1))
@@ -97,11 +93,9 @@ or the latest completion session is restored."
(when vertico-suspend--ov
(delete-overlay vertico-suspend--ov)
(setq vertico-suspend--ov nil))
- ;; vertico-buffer handling
- (when vertico-suspend--wc
- (add-hook 'pre-redisplay-functions 'vertico-buffer--redisplay nil
'local)
- (set-window-configuration vertico-suspend--wc nil t)
- (setq vertico-suspend--wc nil))))
+ (when (bound-and-true-p vertico-buffer--restore)
+ (setq vertico-buffer--restore nil)
+ (vertico-buffer-mode 1))))
(user-error "No Vertico session to suspend or resume")))
(defun vertico-suspend--message (&rest app)