[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/corfu e0198b4 09/29: Simplify post-command behavior
From: |
Stefan Monnier |
Subject: |
[elpa] externals/corfu e0198b4 09/29: Simplify post-command behavior |
Date: |
Fri, 16 Apr 2021 18:44:14 -0400 (EDT) |
branch: externals/corfu
commit e0198b4335add183e0673c2b224e3d6c3ac09cab
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
Simplify post-command behavior
---
corfu.el | 46 ++++++++++++++++++++++------------------------
1 file changed, 22 insertions(+), 24 deletions(-)
diff --git a/corfu.el b/corfu.el
index 4b36ed5..c489bb3 100644
--- a/corfu.el
+++ b/corfu.el
@@ -328,26 +328,6 @@
(unless corfu--popup-ovs
(completion-in-region-mode -1)))
-(defun corfu--teardown ()
- "Teardown Corfu."
- (mapc #'delete-overlay corfu--popup-ovs)
- (when-let (map (assq #'completion-in-region-mode
minor-mode-overriding-map-alist))
- (setcdr map completion-in-region-mode-map))
- (remove-hook 'pre-command-hook #'corfu--pre-command-hook 'local)
- (remove-hook 'post-command-hook #'corfu--post-command-hook 'local)
- (when corfu--current-ov
- (delete-overlay corfu--current-ov))
- (mapc #'kill-local-variable '(corfu--base
- corfu--candidates
- corfu--highlight
- corfu--index
- corfu--input
- corfu--total
- corfu--popup-ovs
- corfu--current-ov
- completion-show-inline-help
- completion-auto-help)))
-
(defun corfu--goto (index)
"Go to candidate with INDEX."
(setq corfu--index (max -1 (min index (- corfu--total 1))))
@@ -427,16 +407,34 @@
(defun corfu--setup ()
"Setup Corfu completion state."
- ;; Keep completion alive when popup is shown
- (let ((pred completion-in-region-mode--predicate))
- (setq completion-in-region-mode--predicate
- (lambda () (or corfu--popup-ovs (funcall pred)))))
+ ;; Keep completion alive when popup is shown (disable predicate check!)
+ (remove-hook 'post-command-hook #'completion-in-region--postch)
(set (make-local-variable 'completion-show-inline-help) nil)
(set (make-local-variable 'completion-auto-help) nil)
(setcdr (assq #'completion-in-region-mode minor-mode-overriding-map-alist)
corfu-map)
(add-hook 'pre-command-hook #'corfu--pre-command-hook nil 'local)
(add-hook 'post-command-hook #'corfu--post-command-hook nil 'local))
+(defun corfu--teardown ()
+ "Teardown Corfu."
+ (mapc #'delete-overlay corfu--popup-ovs)
+ (when-let (map (assq #'completion-in-region-mode
minor-mode-overriding-map-alist))
+ (setcdr map completion-in-region-mode-map))
+ (remove-hook 'pre-command-hook #'corfu--pre-command-hook 'local)
+ (remove-hook 'post-command-hook #'corfu--post-command-hook 'local)
+ (when corfu--current-ov
+ (delete-overlay corfu--current-ov))
+ (mapc #'kill-local-variable '(corfu--base
+ corfu--candidates
+ corfu--highlight
+ corfu--index
+ corfu--input
+ corfu--total
+ corfu--popup-ovs
+ corfu--current-ov
+ completion-show-inline-help
+ completion-auto-help)))
+
(defun corfu--mode-hook ()
"Corfu mode hook."
(if completion-in-region-mode
- [elpa] externals/corfu 15b0eee 05/29: Improve face definitions, (continued)
- [elpa] externals/corfu 15b0eee 05/29: Improve face definitions, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 3f930bc 06/29: Popup improvements/truncation, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu bb55c62 01/29: initial commit, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 7d3c6c4 07/29: README: Update features section, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu a2de3f2 11/29: Adjust faces, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 5571d2b 13/29: Revert "Go back to e0198b4335add183e0673c2b224e3d6c3ac09cab for now", Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 4b32521 12/29: Go back to e0198b4335add183e0673c2b224e3d6c3ac09cab for now, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu f721f1b 14/29: Properly compute character size, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 247c79b 16/29: update screenshot, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 428ef03 08/29: post-command-hook: Make the check more strict, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu e0198b4 09/29: Simplify post-command behavior,
Stefan Monnier <=
- [elpa] externals/corfu a497acc 10/29: Experimental border images, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 17201cd 15/29: Generate image in PBM format, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu f98d239 02/29: Add support for cycling, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu ce983a0 17/29: README: Expand configuration, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 2f9e154 18/29: Use completion--replace, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 219afe2 21/29: Deactivate fancy border if line spacing is used (Fix #1), Stefan Monnier, 2021/04/16
- [elpa] externals/corfu 5bacf55 20/29: Simplifications, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu e6bfd22 26/29: Add corfu-min-width, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu a61992d 29/29: Rework popup function, Stefan Monnier, 2021/04/16
- [elpa] externals/corfu a5fd9ad 22/29: Simplifications, Stefan Monnier, 2021/04/16