dotfiles-misc/protesilaos.dotfiles
1
0
Fork 0
mirror of https://github.com/protesilaos/dotfiles.git synced 2026-09-10 07:16:20 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

emacs: extend prot-minibuffer to cover input methods

Browse source
This commit is contained in:
Protesilaos 2026-08-15 21:35:27 +03:00
parent ceb013bf88
commit 6f85a2eb17
No known key found for this signature in database
GPG key ID: 99BD6459CD5CA3EA
3 changed files with 74 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
emacs/.emacs.d/prot-emacs-modules/prot-emacs-completion.el
View file

@ -43,6 +43,9 @@
(command . (,@eager-update-only
(affixation-function . nil) ; so that the `annotation-function' can take effect
(annotation-function . ,#'prot-minibuffer-command-annotate)))
(prot-minibuffer-input-method . (,@eager-update-only
(group-function . ,#'prot-minibuffer-input-method-group)
(display-sort-function . ,#'prot-minibuffer-input-method-sort)))
(symbol-help . ,eager-update-only)
(denote-file . ,eager-update-only)
(tmr-timer . ,eager-both)

38
emacs/.emacs.d/prot-emacs.org
View file

@ -4217,6 +4217,9 @@ for this.
(command . (,@eager-update-only
(affixation-function . nil) ; so that the `annotation-function' can take effect
(annotation-function . ,#'prot-minibuffer-command-annotate)))
(prot-minibuffer-input-method . (,@eager-update-only
(group-function . ,#'prot-minibuffer-input-method-group)
(display-sort-function . ,#'prot-minibuffer-input-method-sort)))
(symbol-help . ,eager-update-only)
(denote-file . ,eager-update-only)
(tmr-timer . ,eager-both)
@ -13974,6 +13977,10 @@ buffer instead of the current one."
(let ((completion-extra-properties (list :category 'prot-minibuffer-pass)))
(apply args)))
(defun prot-minibuffer@read-input-method-name (&rest args)
(let ((completion-extra-properties (list :category 'prot-minibuffer-input-method)))
(apply args)))
(defun prot-minibuffer--do-advice (advice functions place)
"Handle the advice installed by the function `prot-minibuffer-missing-categories-mode'.
For each function in FUNCTIONS apply ARGS."
@ -13985,11 +13992,16 @@ For each function in FUNCTIONS apply ARGS."
(list advice original my-function-symbol))))
(apply args))))
(defvar prot-minibuffer-missing-completion-categories-symbols
'( read-from-kill-ring read-library-name emoji--read-emoji
read-input-method-name password-store--completing-read)
"Symbols to be advised by `prot-minibuffer-missing-categories-mode'.")
;;;###autoload
(define-minor-mode prot-minibuffer-missing-categories-mode
"When enabled, add missing compleiton categories to relevant prompts."
:global t
(let ((functions '(read-from-kill-ring read-library-name emoji--read-emoji password-store--completing-read)))
(when-let* ((functions prot-minibuffer-missing-completion-categories-symbols))
(if prot-minibuffer-missing-categories-mode
(prot-minibuffer--do-advice #'advice-add functions :around)
(prot-minibuffer--do-advice #'advice-remove functions nil))))
@ -14126,6 +14138,30 @@ package."
libraries))
(prot-minibuffer--set-default-sort libraries))
(defcustom prot-minibuffer-used-input-methods
'("greek" "french-postfix" "spanish-postfix")
"Input methods that I use."
:type '(choice (const nil)
(repeat mule-input-method-string)))
(defun prot-minibuffer--my-method-p (input-method)
"Return non-nil if INPUT-METHOD is a member of `prot-minibuffer-used-input-methods'."
(member input-method prot-minibuffer-used-input-methods))
(defun prot-minibuffer-input-method-sort (input-methods)
"Sort INPUT-METHODS into `prot-minibuffer-used-input-methods' and the rest."
(setq input-methods (prot-minibuffer--set-default-sort input-methods))
(nconc (seq-filter #'prot-minibuffer--my-method-p input-methods)
(seq-remove #'prot-minibuffer--my-method-p input-methods)))
(defun prot-minibuffer-input-method-group (input-method transform)
"Group INPUT-METHOD into `prot-minibuffer-used-input-methods' and the rest.
Do it when TRANSFORM is non-nil, else return INPUT-METHOD."
(cond
(transform input-method)
((prot-minibuffer--my-method-p input-method) "My input methods")
(t "Other input methods")))
;; NOTE 2025-12-19: Maybe there is a better way, but this is okay to start with.
(defun prot-minibuffer-library-annotate (library)
"Return the group documentation of LIBRARY."

35
emacs/.emacs.d/prot-lisp/prot-minibuffer.el
View file

@ -56,6 +56,10 @@
(let ((completion-extra-properties (list :category 'prot-minibuffer-pass)))
(apply args)))
(defun prot-minibuffer@read-input-method-name (&rest args)
(let ((completion-extra-properties (list :category 'prot-minibuffer-input-method)))
(apply args)))
(defun prot-minibuffer--do-advice (advice functions place)
"Handle the advice installed by the function `prot-minibuffer-missing-categories-mode'.
For each function in FUNCTIONS apply ARGS."
@ -67,11 +71,16 @@ For each function in FUNCTIONS apply ARGS."
(list advice original my-function-symbol))))
(apply args))))
(defvar prot-minibuffer-missing-completion-categories-symbols
'( read-from-kill-ring read-library-name emoji--read-emoji
read-input-method-name password-store--completing-read)
"Symbols to be advised by `prot-minibuffer-missing-categories-mode'.")
;;;###autoload
(define-minor-mode prot-minibuffer-missing-categories-mode
"When enabled, add missing compleiton categories to relevant prompts."
:global t
(let ((functions '(read-from-kill-ring read-library-name emoji--read-emoji password-store--completing-read)))
(when-let* ((functions prot-minibuffer-missing-completion-categories-symbols))
(if prot-minibuffer-missing-categories-mode
(prot-minibuffer--do-advice #'advice-add functions :around)
(prot-minibuffer--do-advice #'advice-remove functions nil))))
@ -208,6 +217,30 @@ package."
libraries))
(prot-minibuffer--set-default-sort libraries))
(defcustom prot-minibuffer-used-input-methods
'("greek" "french-postfix" "spanish-postfix")
"Input methods that I use."
:type '(choice (const nil)
(repeat mule-input-method-string)))
(defun prot-minibuffer--my-method-p (input-method)
"Return non-nil if INPUT-METHOD is a member of `prot-minibuffer-used-input-methods'."
(member input-method prot-minibuffer-used-input-methods))
(defun prot-minibuffer-input-method-sort (input-methods)
"Sort INPUT-METHODS into `prot-minibuffer-used-input-methods' and the rest."
(setq input-methods (prot-minibuffer--set-default-sort input-methods))
(nconc (seq-filter #'prot-minibuffer--my-method-p input-methods)
(seq-remove #'prot-minibuffer--my-method-p input-methods)))
(defun prot-minibuffer-input-method-group (input-method transform)
"Group INPUT-METHOD into `prot-minibuffer-used-input-methods' and the rest.
Do it when TRANSFORM is non-nil, else return INPUT-METHOD."
(cond
(transform input-method)
((prot-minibuffer--my-method-p input-method) "My input methods")
(t "Other input methods")))
;; NOTE 2025-12-19: Maybe there is a better way, but this is okay to start with.
(defun prot-minibuffer-library-annotate (library)
"Return the group documentation of LIBRARY."