From 52e867d3865f17f24e0b318127e7e9326f06fbc1 Mon Sep 17 00:00:00 2001 From: Alejandro Blasco Date: Thu, 21 Aug 2025 15:13:44 +0200 Subject: [PATCH] refactor(corfu): use tty child frames in 31+ Since 31.1 child frames are now supported on TTY frames. This supports use-cases like Posframe, Corfu, and child frames acting like tooltips. `corfu-terminal` package should be only loaded on older versions. Ref: emacs-mirror/emacs@a8c83b496b3f Ref: emacs-mirror/emacs@8aef5d224a6f --- modules/completion/corfu/config.el | 1 + modules/completion/corfu/packages.el | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/completion/corfu/config.el b/modules/completion/corfu/config.el index 127ff5509..3e6566bb2 100644 --- a/modules/completion/corfu/config.el +++ b/modules/completion/corfu/config.el @@ -209,6 +209,7 @@ This function respects the value of `+corfu-want-minibuffer-completion': (use-package! corfu-terminal :when (modulep! :os tty) + :unless (featurep 'tty-child-frames) :hook ((corfu-mode . corfu-terminal-mode))) diff --git a/modules/completion/corfu/packages.el b/modules/completion/corfu/packages.el index 890aa3eb7..8b18ff74e 100644 --- a/modules/completion/corfu/packages.el +++ b/modules/completion/corfu/packages.el @@ -11,7 +11,8 @@ ;; save contributor headaches we should only pin vertico's orderless and leave ;; this one unpinned. (package! orderless)) -(when (modulep! :os tty) +(when (and (modulep! :os tty) + (not (featurep 'tty-child-frames))) (package! corfu-terminal :pin "501548c3d51f926c687e8cd838c5865ec45d03cc")) (when (modulep! :editor snippets) (package! yasnippet-capf :pin "f53c42a996b86fc95b96bdc2deeb58581f48c666"))