[elpa] externals/consult 9ff6dd0: consult-completion-in-region: Provide :annotation-function from :company-docsig
branch: externals/consult commit 9ff6dd0fffbf785ba3f1d914f6e285968fb4a9b7 Author: Daniel Mendler Commit: Daniel Mendler consult-completion-in-region: Provide :annotation-function from :company-docsig --- consult.el | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/consult.el b/consult.el index 4c83f56..9fd491d 100644 --- a/consult.el +++ b/consult.el @@ -2092,7 +2092,17 @@ These configuration options are supported: (initial (buffer-substring-no-properties start end)) (metadata (completion-metadata initial collection predicate)) (threshold (or (plist-get config :cycle-threshold) (completion--cycle-threshold metadata))) - (all (completion-all-completions initial collection predicate (length initial + (all (completion-all-completions initial collection predicate (length initial))) + ;; Provide `:annotation-function' if `:company-docsig' is specified + (completion-extra-properties + (if-let (fun (and (not (plist-get completion-extra-properties :annotation-function)) +(plist-get completion-extra-properties :company-docsig))) + `(:annotation-function +,(lambda (cand) + (concat (propertize " " 'display '(space :align-to center)) + (funcall fun cand))) +,@completion-extra-properties) +completion-extra-properties))) ;; error if `threshold' is t or the improper list `all' is too short (if (and threshold (or (not (consp (ignore-errors (nthcdr threshold all
[elpa] externals/corfu 3041831: Version 0.10
branch: externals/corfu commit 304183102deed36e59c7c65e8123a7740c220cd0 Author: Daniel Mendler Commit: Daniel Mendler Version 0.10 --- corfu.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corfu.el b/corfu.el index 3a5c693..5151e9c 100644 --- a/corfu.el +++ b/corfu.el @@ -5,7 +5,7 @@ ;; Author: Daniel Mendler ;; Maintainer: Daniel Mendler ;; Created: 2021 -;; Version: 0.9 +;; Version: 0.10 ;; Package-Requires: ((emacs "27.1")) ;; Homepage: https://github.com/minad/corfu
[elpa] externals/vertico updated (bf727c2 -> 4b2e7ac)
elpasync pushed a change to branch externals/vertico. from bf727c2 vertico--recompute-candidates: Extract vertico--filter-files new 7b93824 Version 0.13 new 4b2e7ac Extensions: Require Vertico Summary of changes: extensions/vertico-buffer.el| 2 +- extensions/vertico-directory.el | 2 +- extensions/vertico-flat.el | 2 +- extensions/vertico-indexed.el | 2 +- extensions/vertico-mouse.el | 2 +- extensions/vertico-quick.el | 2 +- extensions/vertico-repeat.el| 2 +- extensions/vertico-reverse.el | 2 +- vertico.el | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)
[elpa] externals/vertico 4b2e7ac 2/2: Extensions: Require Vertico
branch: externals/vertico commit 4b2e7acfdbe4b827603b9b7c02ef4260f71a514c Author: Daniel Mendler Commit: Daniel Mendler Extensions: Require Vertico --- extensions/vertico-buffer.el| 2 +- extensions/vertico-directory.el | 2 +- extensions/vertico-flat.el | 2 +- extensions/vertico-indexed.el | 2 +- extensions/vertico-mouse.el | 2 +- extensions/vertico-quick.el | 2 +- extensions/vertico-repeat.el| 2 +- extensions/vertico-reverse.el | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/extensions/vertico-buffer.el b/extensions/vertico-buffer.el index c5e6610..49ed37b 100644 --- a/extensions/vertico-buffer.el +++ b/extensions/vertico-buffer.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler ;; Created: 2021 ;; Version: 0.1 -;; Package-Requires: ((emacs "27.1")) +;; Package-Requires: ((emacs "27.1") (vertico "0.13")) ;; Homepage: https://github.com/minad/vertico ;; This file is part of GNU Emacs. diff --git a/extensions/vertico-directory.el b/extensions/vertico-directory.el index bad6a91..667345c 100644 --- a/extensions/vertico-directory.el +++ b/extensions/vertico-directory.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler ;; Created: 2021 ;; Version: 0.1 -;; Package-Requires: ((emacs "27.1")) +;; Package-Requires: ((emacs "27.1") (vertico "0.13")) ;; Homepage: https://github.com/minad/vertico ;; This file is part of GNU Emacs. diff --git a/extensions/vertico-flat.el b/extensions/vertico-flat.el index afa702b..eaaa846 100644 --- a/extensions/vertico-flat.el +++ b/extensions/vertico-flat.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler ;; Created: 2021 ;; Version: 0.1 -;; Package-Requires: ((emacs "27.1")) +;; Package-Requires: ((emacs "27.1") (vertico "0.13")) ;; Homepage: https://github.com/minad/vertico ;; This file is part of GNU Emacs. diff --git a/extensions/vertico-indexed.el b/extensions/vertico-indexed.el index 3ef76a8..a43338e 100644 --- a/extensions/vertico-indexed.el +++ b/extensions/vertico-indexed.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler ;; Created: 2021 ;; Version: 0.1 -;; Package-Requires: ((emacs "27.1")) +;; Package-Requires: ((emacs "27.1") (vertico "0.13")) ;; Homepage: https://github.com/minad/vertico ;; This file is part of GNU Emacs. diff --git a/extensions/vertico-mouse.el b/extensions/vertico-mouse.el index 23a7758..a1c05f7 100644 --- a/extensions/vertico-mouse.el +++ b/extensions/vertico-mouse.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler ;; Created: 2021 ;; Version: 0.1 -;; Package-Requires: ((emacs "27.1")) +;; Package-Requires: ((emacs "27.1") (vertico "0.13")) ;; Homepage: https://github.com/minad/vertico ;; This file is part of GNU Emacs. diff --git a/extensions/vertico-quick.el b/extensions/vertico-quick.el index 97ae7fc..2c9fda4 100644 --- a/extensions/vertico-quick.el +++ b/extensions/vertico-quick.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler ;; Created: 2021 ;; Version: 0.1 -;; Package-Requires: ((emacs "27.1")) +;; Package-Requires: ((emacs "27.1") (vertico "0.13")) ;; Homepage: https://github.com/minad/vertico ;; This file is part of GNU Emacs. diff --git a/extensions/vertico-repeat.el b/extensions/vertico-repeat.el index 702897f..b46c93b 100644 --- a/extensions/vertico-repeat.el +++ b/extensions/vertico-repeat.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler ;; Created: 2021 ;; Version: 0.1 -;; Package-Requires: ((emacs "27.1")) +;; Package-Requires: ((emacs "27.1") (vertico "0.13")) ;; Homepage: https://github.com/minad/vertico ;; This file is part of GNU Emacs. diff --git a/extensions/vertico-reverse.el b/extensions/vertico-reverse.el index 7f9fd01..60721fe 100644 --- a/extensions/vertico-reverse.el +++ b/extensions/vertico-reverse.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler ;; Created: 2021 ;; Version: 0.1 -;; Package-Requires: ((emacs "27.1")) +;; Package-Requires: ((emacs "27.1") (vertico "0.13")) ;; Homepage: https://github.com/minad/vertico ;; This file is part of GNU Emacs.
[elpa] externals/vertico 7b93824 1/2: Version 0.13
branch: externals/vertico commit 7b93824bc7831ff20f3dbefdb6e82a7a15b2f5f7 Author: Daniel Mendler Commit: Daniel Mendler Version 0.13 --- vertico.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vertico.el b/vertico.el index 9213f4c..e4f2626 100644 --- a/vertico.el +++ b/vertico.el @@ -5,7 +5,7 @@ ;; Author: Daniel Mendler ;; Maintainer: Daniel Mendler ;; Created: 2021 -;; Version: 0.12 +;; Version: 0.13 ;; Package-Requires: ((emacs "27.1")) ;; Homepage: https://github.com/minad/vertico
[elpa] externals/corfu updated (3041831 -> a2ddf92)
elpasync pushed a change to branch externals/corfu. from 3041831 Version 0.10 new a44c778 Yet another hack: posn-at-point computation returns wrong y-coordinate on Emacs 28 new a2ddf92 Minor cleanup Summary of changes: corfu.el | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-)
[elpa] externals/corfu a2ddf92 2/2: Minor cleanup
branch: externals/corfu commit a2ddf927496d8a81fb4ab14f1cd8210fad5531a9 Author: Daniel Mendler Commit: Daniel Mendler Minor cleanup --- corfu.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/corfu.el b/corfu.el index afeaab7..0bbb7fb 100644 --- a/corfu.el +++ b/corfu.el @@ -352,10 +352,10 @@ filter string with spaces is allowed." ;;; XXX HACK y-coordinate position computation is wrong ;;; if there exists a flymake underline overlay at that point. ;;; Take the y coordinate from the current point. - (x (car (posn-x-y (posn-at-point pos - (y (cdr (posn-x-y (posn-at-point (point)) + (x (or (car (posn-x-y (posn-at-point pos))) 0)) + (y (or (cdr (posn-x-y (posn-at-point (point 0))) (corfu--make-frame - (- (or x 0) mw) (or y 0) + (- x mw) y (+ (* width cw) mw mw) (* (length lines) ch) (mapconcat (lambda (line) (let ((str (concat
[elpa] externals/corfu a44c778 1/2: Yet another hack: posn-at-point computation returns wrong y-coordinate on Emacs 28
branch: externals/corfu commit a44c7785ccd493f203b517a70c19ec9d644da15e Author: Daniel Mendler Commit: Daniel Mendler Yet another hack: posn-at-point computation returns wrong y-coordinate on Emacs 28 --- corfu.el | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/corfu.el b/corfu.el index 5151e9c..afeaab7 100644 --- a/corfu.el +++ b/corfu.el @@ -349,9 +349,13 @@ filter string with spaces is allowed." (apply #'max corfu-min-width (mapcar #'string-width lines (row 0) - (pos (posn-x-y (posn-at-point pos + ;;; XXX HACK y-coordinate position computation is wrong + ;;; if there exists a flymake underline overlay at that point. + ;;; Take the y coordinate from the current point. + (x (car (posn-x-y (posn-at-point pos + (y (cdr (posn-x-y (posn-at-point (point)) (corfu--make-frame - (- (or (car pos) 0) mw) (or (cdr pos) 0) + (- (or x 0) mw) (or y 0) (+ (* width cw) mw mw) (* (length lines) ch) (mapconcat (lambda (line) (let ((str (concat
[elpa] externals/vertico 527c53d: vertico--arrange-candidates: Remove unnecessary variable
branch: externals/vertico commit 527c53d839359c66005dccd3f488987507f779fa Author: Daniel Mendler Commit: Daniel Mendler vertico--arrange-candidates: Remove unnecessary variable --- vertico.el | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vertico.el b/vertico.el index e4f2626..bcb1c6d 100644 --- a/vertico.el +++ b/vertico.el @@ -460,14 +460,14 @@ The function is configured by BY, BSIZE, BINDEX, BPRED and PRED." "Arrange candidates given the current METADATA." (let ((curr-line 0) (lines)) ;; Compute group titles -(let* ((start (min (max 0 (- vertico--index (/ vertico-count 2) (1- (mod vertico-count 2 +(let* ((index (min (max 0 (- vertico--index (/ vertico-count 2) (1- (mod vertico-count 2 (max 0 (- vertico--total vertico-count - (index start) (title) + (title) (group-fun (completion-metadata-get metadata 'group-function)) (group-format (and group-fun vertico-group-format (concat vertico-group-format "\n"))) (candidates -(thread-last (seq-subseq vertico--candidates start - (min (+ start vertico-count) vertico--total)) +(thread-last (seq-subseq vertico--candidates index + (min (+ index vertico-count) vertico--total)) (funcall vertico--highlight-function) (vertico--affixate metadata (dolist (cand candidates)
[elpa] externals/corfu updated (a2ddf92 -> 2620355)
elpasync pushed a change to branch externals/corfu. from a2ddf92 Minor cleanup new bb4eccf corfu: add no-focus-on-map new 2620355 Better y-position computation Summary of changes: corfu.el | 12 1 file changed, 8 insertions(+), 4 deletions(-)
[elpa] externals/corfu bb4eccf 1/2: corfu: add no-focus-on-map
branch: externals/corfu commit bb4eccf6ed855e2004c35bad11ac31d4a8d9b589 Author: Daniel Mendler Commit: Daniel Mendler corfu: add no-focus-on-map --- corfu.el | 1 + 1 file changed, 1 insertion(+) diff --git a/corfu.el b/corfu.el index 0bbb7fb..5b78cbe 100644 --- a/corfu.el +++ b/corfu.el @@ -203,6 +203,7 @@ filter string with spaces is allowed." (defvar corfu--frame-parameters '((no-accept-focus . t) +(no-focus-on-map . t) (min-width . t) (min-height . t) (width . 0)
[elpa] externals/corfu 2620355 2/2: Better y-position computation
branch: externals/corfu commit 2620355524786f5be670ee128ff482221a2097be Author: Daniel Mendler Commit: Daniel Mendler Better y-position computation --- corfu.el | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/corfu.el b/corfu.el index 5b78cbe..ebb1d21 100644 --- a/corfu.el +++ b/corfu.el @@ -350,11 +350,14 @@ filter string with spaces is allowed." (apply #'max corfu-min-width (mapcar #'string-width lines (row 0) - ;;; XXX HACK y-coordinate position computation is wrong - ;;; if there exists a flymake underline overlay at that point. - ;;; Take the y coordinate from the current point. + ;;; XXX HACK On Emacs 28 y-coordinate position computation is wrong if + ;;; there exists a flymake underline overlay at that point. Therefore + ;;; compute the y-coordinate at the line beginning. (x (or (car (posn-x-y (posn-at-point pos))) 0)) - (y (or (cdr (posn-x-y (posn-at-point (point 0))) + (y (save-excursion + (goto-char pos) + (beginning-of-line) + (or (cdr (posn-x-y (posn-at-point))) 0 (corfu--make-frame (- x mw) y (+ (* width cw) mw mw) (* (length lines) ch)
[elpa] externals/diff-hl d225def: Check that diff-hl-show-hunk-diff-buffer-name exists first
branch: externals/diff-hl commit d225def4a473a16ac994124e063695ef9cef3308 Author: Dmitry Gutov Commit: Dmitry Gutov Check that diff-hl-show-hunk-diff-buffer-name exists first #167 --- diff-hl-show-hunk.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/diff-hl-show-hunk.el b/diff-hl-show-hunk.el index ee047bf..6e3e63b 100644 --- a/diff-hl-show-hunk.el +++ b/diff-hl-show-hunk.el @@ -109,7 +109,8 @@ corresponding to the clicked line in the original buffer." (read-only-mode -1) (erase-buffer)) (bury-buffer diff-hl-show-hunk-buffer-name) - (bury-buffer diff-hl-show-hunk-diff-buffer-name) + (when (get-buffer diff-hl-show-hunk-diff-buffer-name) +(bury-buffer diff-hl-show-hunk-diff-buffer-name)) (when diff-hl-show-hunk--hide-function (let ((hidefunc diff-hl-show-hunk--hide-function)) (setq diff-hl-show-hunk--hide-function nil)
