From 2066e827155ae2893097360024ffd975166a44ef Mon Sep 17 00:00:00 2001 From: JSDurand Date: Sat, 23 Jan 2021 00:23:05 +0800 Subject: More custom functions and adjust for custom completion framework * LICENSE: Add GPLv3. * basic.el (durand-enlarge-window): (durand-shrink-window): (durand-enlarge-window-horizontally): (durand-shrink-window-horizontally): Now I can easily maximize or minimize windows. * comb/orderless-conf.el ("orderless"): Now I try to use my own completion framework. * common.el (durand-embark-scroll-down-or-go-to-completions): (durand-embark-scroll-up-or-go-to-completions): (durand-completion-scroll-down-or-go-to-minibuffer): (durand-completion-scroll-up-or-go-to-minibuffer): Move these functions here since they do not belong to the completion framework in my opinion. (register): (register-val-jump-to): Rewrite this method so that it does not have to ask me if I want to open a file while jumping. * completion-conf.el: My intended completion framework, which is still work in progress. * init.el ("comb/orderless-conf.el"): ("completion-conf.el"): Adjust things accordingly. ("durand-simple"): My custom functions for viewing and for opening things. * modeline.el (modeline-propertize): (modeline-format-minor-modes): (modeline-format-major-mode): Now the macro `modeline-propertize' won't override properties that it does not intend to define. This has the effect that the properties of the original constructs will go through and have effect. (modeline-format-main): Make sure the space has a positive length. (modeline-format-buffer-name): Make sure the length does not exceed half the width of the window. --- comb/orderless-conf.el | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'comb') diff --git a/comb/orderless-conf.el b/comb/orderless-conf.el index 2d669a4..a86e40e 100644 --- a/comb/orderless-conf.el +++ b/comb/orderless-conf.el @@ -37,3 +37,45 @@ (cond ((= (aref pattern 0) ?,) (cons 'orderless-strict-leading-initialism (substring pattern 1)))))) + + +(defvar durand-headlong-entered-minibuffer-p nil + "Whether or not we have entered minibuffer. + +This is used for determining if we shall exit the minibuffer when +there is only one candidate left.") + +;;;###autoload +(defun durand-headlong-minibuffer-setup-hook () + "The entry for the completion to be headlong. +Simply add this function to `minibuffer-setup-hook'." + ;; NOTE: When we run this function we first enter minibuffer, so we + ;; set a variable to its appropriate value. + (set 'durand-headlong-entered-minibuffer-p nil) + (add-hook 'post-command-hook 'durand-headlong-post-command-hook t) + (add-hook 'minibuffer-exit-hook 'durand-headlong-minibuffer-exit-hook)) + +;;;###autoload +(defun durand-headlong-post-command-hook () + "Exit the minibuffer if there is only one candidate left. + +In practice, when we first enter minibuffer, there is some +abnormal behaviour, so we only check when we have entered the +minibuffer as usual." + (let ((comps (completion-all-completions + (minibuffer-contents) + minibuffer-completion-table minibuffer-completion-predicate + (- (point) (minibuffer-prompt-end))))) + (cond + ((and durand-headlong-entered-minibuffer-p + comps + (not (consp (cdr comps)))) + (minibuffer-force-complete-and-exit)) + (t (set 'durand-headlong-entered-minibuffer-p t))))) + +;;;###autoload +(defun durand-headlong-minibuffer-exit-hook () + "Remove the hooks we added." + (remove-hook 'post-command-hook 'durand-headlong-post-command-hook) + (remove-hook 'minibuffer-setup-hook 'durand-headlong-minibuffer-setup-hook) + (remove-hook 'minibuffer-exit-hook 'durand-headlong-minibuffer-exit-hook)) -- cgit v1.2.3-18-g5258