[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 878ea4d: Revert "Allow completion styles to adjust completion met
From: |
João Távora |
Subject: |
master 878ea4d: Revert "Allow completion styles to adjust completion metadata" |
Date: |
Sat, 26 Oct 2019 08:46:05 -0400 (EDT) |
branch: master
commit 878ea4d840880f7bdb2d0b0142a9409d34e53f88
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
Revert "Allow completion styles to adjust completion metadata"
Unbreaks the build.
This reverts commit 7fc0292f5c49d11fc39853f8bc25586d54221e6a.
Unfortunately, cl-defgeneric has some problems when used in
lisp/minibuffer.el.
---
lisp/minibuffer.el | 46 +++++++++-------------------------------------
1 file changed, 9 insertions(+), 37 deletions(-)
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 35de3fb..7227e83 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -907,31 +907,6 @@ This overrides the defaults specified in
`completion-category-defaults'."
(delete-dups (append (cdr over) (copy-sequence completion-styles)))
completion-styles)))
-(cl-defgeneric completion-adjust-metadata-for-style (style metadata)
- "Adjust METADATA of current completion according to STYLE."
- (:method (_style _metadata) nil) ; nop by default
- (:method
- ((_style (eql flex)) metadata)
- (cl-flet ((compose-flex-sort-fn
- (existing-sort-fn) ; wish `cl-flet' had proper indentation...
- (lambda (completions)
- (let ((res
- (if existing-sort-fn
- (funcall existing-sort-fn completions)
- completions)))
- (sort
- res
- (lambda (c1 c2)
- (or (equal c1 minibuffer-default)
- (> (get-text-property 0 'completion-score c1)
- (get-text-property 0 'completion-score c2)))))))))
- (let ((alist (cdr metadata)))
- (setf (alist-get 'display-sort-function alist)
- (compose-flex-sort-fn (alist-get 'display-sort-function alist)))
- (setf (alist-get 'cycle-sort-function alist)
- (compose-flex-sort-fn (alist-get 'cycle-sort-function alist)))
- metadata))))
-
(defun completion--nth-completion (n string table pred point metadata)
"Call the Nth method of completion styles."
(unless metadata
@@ -961,20 +936,17 @@ This overrides the defaults specified in
`completion-category-defaults'."
(setq string (pop new))
(setq table (pop new))
(setq point (pop new))
- (cl-assert (<= point (length string)))
+ (cl-assert (<= point (length string)))
(pop new))))
- (result-and-style
- (completion--some
- (lambda (style)
- (let ((probe (funcall (nth n (assq style
- completion-styles-alist))
- string table pred point)))
- (and probe (cons probe style))))
- (completion--styles metadata))))
- (completion-adjust-metadata-for-style (cdr result-and-style) metadata)
+ (result
+ (completion--some (lambda (style)
+ (funcall (nth n (assq style
+ completion-styles-alist))
+ string table pred point))
+ (completion--styles metadata))))
(if requote
- (funcall requote (car result-and-style) n)
- (car result-and-style))))
+ (funcall requote result n)
+ result)))
(defun completion-try-completion (string table pred point &optional metadata)
"Try to complete STRING using completion table TABLE.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 878ea4d: Revert "Allow completion styles to adjust completion metadata",
João Távora <=