From 4b5d83b693930d040b24618fb459380950e0304b Mon Sep 17 00:00:00 2001 From: Protesilaos Date: Wed, 29 Jul 2026 15:49:53 +0300 Subject: [PATCH] emacs: tweak the completion-category-overrides --- .../prot-emacs-completion.el | 29 +++++++------------ emacs/.emacs.d/prot-emacs.org | 29 +++++++------------ 2 files changed, 22 insertions(+), 36 deletions(-) diff --git a/emacs/.emacs.d/prot-emacs-modules/prot-emacs-completion.el b/emacs/.emacs.d/prot-emacs-modules/prot-emacs-completion.el index de51bc49..438defd8 100644 --- a/emacs/.emacs.d/prot-emacs-modules/prot-emacs-completion.el +++ b/emacs/.emacs.d/prot-emacs-modules/prot-emacs-completion.el @@ -22,40 +22,33 @@ (eager-update . t))) (eager-update-properties-no-sort (append eager-update-properties (list (cons 'display-sort-function #'identity))))) (setq completion-category-overrides - `((file . ((styles . (partial-completion)) - (eager-display . nil) - (eager-update . t) + `((file . (,@eager-update-properties + (styles . (partial-completion)) (group-function . ,#'prot-minibuffer-file-group) (affixation-function . ,#'prot-minibuffer-file-affixate) (display-sort-function . ,#'prot-minibuffer-file-sort))) - (bookmark . (,@eager-update-properties - (affixation-function . ,#'prot-minibuffer-bookmark-affixate))) + (buffer . (,@eager-update-properties + (affixation-function . ,#'prot-minibuffer-buffer-affixate))) (project-file . (,@eager-update-properties (group-function . ,#'prot-minibuffer-file-group) (affixation-function . ,#'prot-minibuffer-file-affixate))) (prot-minibuffer-library . (,@eager-update-properties (annotation-function . ,#'prot-minibuffer-library-annotate) (display-sort-function . ,#'prot-minibuffer-library-sort))) - (symbol-help . (,@eager-update-properties - (group-function . ,#'prot-minibuffer-symbol-group) - (display-sort-function . ,#'prot-minibuffer-symbol-sort))) - (buffer . (,@eager-update-properties - ;; NOTE 2026-07-25: I am disabling this because it messes up with the sorting. - ;; (group-function . ,#'prot-minibuffer-buffer-group) - (affixation-function . ,#'prot-minibuffer-buffer-affixate) - (display-sort-function . ,#'prot-minibuffer-buffer-sort))) - (command . ((affixation-function . nil) + (bookmark . (,@eager-update-properties + (affixation-function . ,#'prot-minibuffer-bookmark-affixate))) + (command . (,@eager-update-properties + (affixation-function . nil) ; so that the `annotation-function' can take effect (annotation-function . ,#'prot-minibuffer-command-annotate))) + (symbol-help . ,eager-update-properties) (denote-file . ,eager-update-properties) (prot-minibuffer-emoji . ,eager-update-properties) (theme . ,eager-update-properties) (unicode-name . ,eager-update-properties) (imenu . ,eager-update-properties-no-sort) (consult-location . ,eager-update-properties-no-sort) - (prot-minibuffer-kill-ring . ((eager-display . t) - (eager-update . t) - (display-sort-function . identity))) - (prot-minibuffer-pass . ((display-sort-function . minibuffer-sort-by-history))))))) + (prot-minibuffer-pass . ,eager-update-properties-no-sort) + (prot-minibuffer-kill-ring . ,eager-update-properties-no-sort))))) ;;; Orderless completion style (and prot-orderless.el) (when prot-emacs-completion-extras diff --git a/emacs/.emacs.d/prot-emacs.org b/emacs/.emacs.d/prot-emacs.org index 1043f610..42bd9130 100644 --- a/emacs/.emacs.d/prot-emacs.org +++ b/emacs/.emacs.d/prot-emacs.org @@ -4192,40 +4192,33 @@ for this. (eager-update . t))) (eager-update-properties-no-sort (append eager-update-properties (list (cons 'display-sort-function #'identity))))) (setq completion-category-overrides - `((file . ((styles . (partial-completion)) - (eager-display . nil) - (eager-update . t) + `((file . (,@eager-update-properties + (styles . (partial-completion)) (group-function . ,#'prot-minibuffer-file-group) (affixation-function . ,#'prot-minibuffer-file-affixate) (display-sort-function . ,#'prot-minibuffer-file-sort))) - (bookmark . (,@eager-update-properties - (affixation-function . ,#'prot-minibuffer-bookmark-affixate))) + (buffer . (,@eager-update-properties + (affixation-function . ,#'prot-minibuffer-buffer-affixate))) (project-file . (,@eager-update-properties (group-function . ,#'prot-minibuffer-file-group) (affixation-function . ,#'prot-minibuffer-file-affixate))) (prot-minibuffer-library . (,@eager-update-properties (annotation-function . ,#'prot-minibuffer-library-annotate) (display-sort-function . ,#'prot-minibuffer-library-sort))) - (symbol-help . (,@eager-update-properties - (group-function . ,#'prot-minibuffer-symbol-group) - (display-sort-function . ,#'prot-minibuffer-symbol-sort))) - (buffer . (,@eager-update-properties - ;; NOTE 2026-07-25: I am disabling this because it messes up with the sorting. - ;; (group-function . ,#'prot-minibuffer-buffer-group) - (affixation-function . ,#'prot-minibuffer-buffer-affixate) - (display-sort-function . ,#'prot-minibuffer-buffer-sort))) - (command . ((affixation-function . nil) + (bookmark . (,@eager-update-properties + (affixation-function . ,#'prot-minibuffer-bookmark-affixate))) + (command . (,@eager-update-properties + (affixation-function . nil) ; so that the `annotation-function' can take effect (annotation-function . ,#'prot-minibuffer-command-annotate))) + (symbol-help . ,eager-update-properties) (denote-file . ,eager-update-properties) (prot-minibuffer-emoji . ,eager-update-properties) (theme . ,eager-update-properties) (unicode-name . ,eager-update-properties) (imenu . ,eager-update-properties-no-sort) (consult-location . ,eager-update-properties-no-sort) - (prot-minibuffer-kill-ring . ((eager-display . t) - (eager-update . t) - (display-sort-function . identity))) - (prot-minibuffer-pass . ((display-sort-function . minibuffer-sort-by-history))))))) + (prot-minibuffer-pass . ,eager-update-properties-no-sort) + (prot-minibuffer-kill-ring . ,eager-update-properties-no-sort))))) #+end_src *** The =prot-emacs-completion.el= for the ~orderless~ completion style