* [PATCH] `completion-all-sorted-completions`: Sort alphabetically
@ 2021-04-19 21:02 Daniel Mendler
2021-04-19 22:09 ` Stefan Monnier
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Mendler @ 2021-04-19 21:02 UTC (permalink / raw)
To: emacs-devel@gnu.org
[-- Attachment #1: Type: text/plain, Size: 144 bytes --]
Patch attached which adds the alphabetical sorting to
`completion-all-sorted-completions`. I extracted the sorting functions
for readability.
[-- Attachment #2: 0001-completion-all-sorted-completions-Additional-alphabe.patch --]
[-- Type: text/x-diff, Size: 3728 bytes --]
From 1f8759ebdd3d9e3d646875a7e01d3e8136edb6d3 Mon Sep 17 00:00:00 2001
From: Daniel Mendler <mail@daniel-mendler.de>
Date: Mon, 19 Apr 2021 22:13:55 +0200
Subject: [PATCH] completion-all-sorted-completions: Additional alphabetical
sorting
minibuffer.el (completion-all-sorted-completions): Use function
`minibuffer--sort-by-length-alpha` which sorts by length and
alphabetically.
minibuffer.el (completion-all-sorted-completions): Extract
`minibuffer--sort-by-position`.
---
lisp/minibuffer.el | 49 ++++++++++++++++++++++++++++------------------
1 file changed, 30 insertions(+), 19 deletions(-)
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index c19f909629..4ed596430c 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1362,6 +1362,25 @@ minibuffer--sort-by-key
(sort (mapcar (lambda (x) (cons (funcall keyfun x) x)) elems)
#'car-less-than-car)))
+(defun minibuffer--sort-by-position (hist elems)
+ "Sort ELEMS by their position in HIST."
+ (let ((hash (make-hash-table :test #'equal :size (length hist)))
+ (index 0))
+ ;; Record positions in hash
+ (dolist (c hist)
+ (unless (gethash c hash)
+ (puthash c index hash))
+ (cl-incf index))
+ (minibuffer--sort-by-key
+ elems (lambda (x) (gethash x hash most-positive-fixnum)))))
+
+(defun minibuffer--sort-by-length-alpha (elems)
+ "Sort ELEMS first by length, then alphabetically."
+ (sort elems (lambda (c1 c2)
+ (or (< (length c1) (length c2))
+ (and (= (length c1) (length c2))
+ (string< c1 c2))))))
+
(defun completion-all-sorted-completions (&optional start end)
(or completion-all-sorted-completions
(let* ((start (or start (minibuffer-prompt-end)))
@@ -1395,25 +1414,17 @@ completion-all-sorted-completions
(sort-fun
(setq all (funcall sort-fun all)))
(t
- ;; Prefer shorter completions, by default.
- (setq all (sort all (lambda (c1 c2) (< (length c1) (length c2)))))
- (if (and (minibufferp) (not (eq minibuffer-history-variable t)))
- ;; Prefer recently used completions and put the default, if
- ;; it exists, on top.
- (let* ((hist (symbol-value minibuffer-history-variable))
- (hash (make-hash-table :test #'equal :size (length hist)))
- (index 0)
- (def (car-safe minibuffer-default)))
- ;; Record history positions in hash
- (dolist (c hist)
- (unless (gethash c hash)
- (puthash c index hash))
- (cl-incf index))
- (when (stringp def)
- (puthash def -1 hash))
- (setq all (minibuffer--sort-by-key
- all (lambda (x)
- (gethash x hash most-positive-fixnum))))))))
+ ;; Sort first by length and alphabetically.
+ (setq all (minibuffer--sort-by-length-alpha all))
+
+ ;; Sort by history position, put the default, if it
+ ;; exists, on top.
+ (when (and (minibufferp) (not (eq minibuffer-history-variable t)))
+ (let ((def (car-safe minibuffer-default))
+ (hist (symbol-value minibuffer-history-variable)))
+ (setq all (minibuffer--sort-by-position
+ (if def (cons def hist) hist)
+ all))))))
;; Cache the result. This is not just for speed, but also so that
;; repeated calls to minibuffer-force-complete can cycle through
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-19 22:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-19 21:02 [PATCH] `completion-all-sorted-completions`: Sort alphabetically Daniel Mendler
2021-04-19 22:09 ` Stefan Monnier
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.