branch: externals/vertico commit b8c9e39dbc39d2c4cd4e116c4bc6f835ed2f114b Author: Daniel Mendler <m...@daniel-mendler.de> Commit: Daniel Mendler <m...@daniel-mendler.de>
Require Emacs 28.1 --- CHANGELOG.org | 1 + README.org | 8 ++++---- extensions/vertico-buffer.el | 2 +- extensions/vertico-directory.el | 2 +- extensions/vertico-flat.el | 2 +- extensions/vertico-grid.el | 4 ++-- extensions/vertico-indexed.el | 2 +- extensions/vertico-mouse.el | 2 +- extensions/vertico-multiform.el | 2 +- extensions/vertico-quick.el | 2 +- extensions/vertico-repeat.el | 2 +- extensions/vertico-reverse.el | 2 +- extensions/vertico-suspend.el | 2 +- extensions/vertico-unobtrusive.el | 2 +- vertico.el | 6 +++--- 15 files changed, 21 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index 07442d5e90..e08380a82d 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -4,6 +4,7 @@ * Development +- Require Emacs 28.1. - Fix behavior when a function is passed as =REQUIRE-MATCH= argument to ~completing-read~. - Drop obsolete command alias ~vertico-repeat-last~. diff --git a/README.org b/README.org index ce342504b2..3a705f5007 100644 --- a/README.org +++ b/README.org @@ -103,9 +103,9 @@ to take advantage of ~use-package~. Here is an example configuration: :custom ;; Support opening new minibuffers from inside existing minibuffers. (enable-recursive-minibuffers t) - ;; Emacs 28 and newer: Hide commands in M-x which do not work in the current - ;; mode. Vertico commands are hidden in normal buffers. This setting is - ;; useful beyond Vertico. + ;; Hide commands in M-x which do not work in the current mode. Vertico + ;; commands are hidden in normal buffers. This setting is useful beyond + ;; Vertico. (read-extended-command-predicate #'command-completion-default-include-p) :init ;; Add prompt indicator to `completing-read-multiple'. @@ -472,7 +472,7 @@ There are other interactive completion UIs, which follow a similar philosophy: Selectrum. Selectrum is not fully compatible with every Emacs completion command and dynamic completion tables, since it uses its own filtering infrastructure, which deviates from the standard Emacs completion facilities. -- Icomplete: Emacs 28 comes with a builtin =icomplete-vertical-mode=, which is a +- Icomplete: Emacs comes with the builtin =icomplete-vertical-mode=, which is a more bare-bone than Vertico. Vertico offers additional flexibility thanks to its [[#extensions][extensions]]. diff --git a/extensions/vertico-buffer.el b/extensions/vertico-buffer.el index c4df781bd9..b111a42ad9 100644 --- a/extensions/vertico-buffer.el +++ b/extensions/vertico-buffer.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler <m...@daniel-mendler.de> ;; Created: 2021 ;; Version: 1.9 -;; Package-Requires: ((emacs "27.1") (compat "30") (vertico "1.9")) +;; Package-Requires: ((emacs "28.1") (compat "30") (vertico "1.9")) ;; 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 536c017d4f..931fb4030a 100644 --- a/extensions/vertico-directory.el +++ b/extensions/vertico-directory.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler <m...@daniel-mendler.de> ;; Created: 2021 ;; Version: 1.9 -;; Package-Requires: ((emacs "27.1") (compat "30") (vertico "1.9")) +;; Package-Requires: ((emacs "28.1") (compat "30") (vertico "1.9")) ;; 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 e0f93e531c..3aa52afd10 100644 --- a/extensions/vertico-flat.el +++ b/extensions/vertico-flat.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler <m...@daniel-mendler.de> ;; Created: 2021 ;; Version: 1.9 -;; Package-Requires: ((emacs "27.1") (compat "30") (vertico "1.9")) +;; Package-Requires: ((emacs "28.1") (compat "30") (vertico "1.9")) ;; Homepage: https://github.com/minad/vertico ;; This file is part of GNU Emacs. diff --git a/extensions/vertico-grid.el b/extensions/vertico-grid.el index 35eaa01e37..6d968c8f64 100644 --- a/extensions/vertico-grid.el +++ b/extensions/vertico-grid.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler <m...@daniel-mendler.de> ;; Created: 2021 ;; Version: 1.9 -;; Package-Requires: ((emacs "27.1") (compat "30") (vertico "1.9")) +;; Package-Requires: ((emacs "28.1") (compat "30") (vertico "1.9")) ;; Homepage: https://github.com/minad/vertico ;; This file is part of GNU Emacs. @@ -165,7 +165,7 @@ When scrolling beyond this limit, candidates may be truncated." `(space :align-to (+ left ,(aref width (1- col))))) line)))) (string-join line))))) -;; Emacs 28: Do not show Vertico commands in M-X +;; Do not show Vertico commands in M-X (dolist (sym '(vertico-grid-left vertico-grid-right vertico-grid-scroll-up vertico-grid-scroll-down)) (put sym 'completion-predicate #'vertico--command-p)) diff --git a/extensions/vertico-indexed.el b/extensions/vertico-indexed.el index 84bed67e58..a373426654 100644 --- a/extensions/vertico-indexed.el +++ b/extensions/vertico-indexed.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler <m...@daniel-mendler.de> ;; Created: 2021 ;; Version: 1.9 -;; Package-Requires: ((emacs "27.1") (compat "30") (vertico "1.9")) +;; Package-Requires: ((emacs "28.1") (compat "30") (vertico "1.9")) ;; 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 b2d55dba61..fe9fc9bcdf 100644 --- a/extensions/vertico-mouse.el +++ b/extensions/vertico-mouse.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler <m...@daniel-mendler.de> ;; Created: 2021 ;; Version: 1.9 -;; Package-Requires: ((emacs "27.1") (compat "30") (vertico "1.9")) +;; Package-Requires: ((emacs "28.1") (compat "30") (vertico "1.9")) ;; Homepage: https://github.com/minad/vertico ;; This file is part of GNU Emacs. diff --git a/extensions/vertico-multiform.el b/extensions/vertico-multiform.el index d9c5b0321c..62b748f6e0 100644 --- a/extensions/vertico-multiform.el +++ b/extensions/vertico-multiform.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler <m...@daniel-mendler.de> ;; Created: 2021 ;; Version: 1.9 -;; Package-Requires: ((emacs "27.1") (compat "30") (vertico "1.9")) +;; Package-Requires: ((emacs "28.1") (compat "30") (vertico "1.9")) ;; 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 30b39ddcba..4692dcb40a 100644 --- a/extensions/vertico-quick.el +++ b/extensions/vertico-quick.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler <m...@daniel-mendler.de> ;; Created: 2021 ;; Version: 1.9 -;; Package-Requires: ((emacs "27.1") (compat "30") (vertico "1.9")) +;; Package-Requires: ((emacs "28.1") (compat "30") (vertico "1.9")) ;; 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 bee16428b2..47c5516cb4 100644 --- a/extensions/vertico-repeat.el +++ b/extensions/vertico-repeat.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler <m...@daniel-mendler.de> ;; Created: 2021 ;; Version: 1.9 -;; Package-Requires: ((emacs "27.1") (compat "30") (vertico "1.9")) +;; Package-Requires: ((emacs "28.1") (compat "30") (vertico "1.9")) ;; 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 a89c3d5240..63edeace61 100644 --- a/extensions/vertico-reverse.el +++ b/extensions/vertico-reverse.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler <m...@daniel-mendler.de> ;; Created: 2021 ;; Version: 1.9 -;; Package-Requires: ((emacs "27.1") (compat "30") (vertico "1.9")) +;; Package-Requires: ((emacs "28.1") (compat "30") (vertico "1.9")) ;; Homepage: https://github.com/minad/vertico ;; This file is part of GNU Emacs. diff --git a/extensions/vertico-suspend.el b/extensions/vertico-suspend.el index a405809351..0235226206 100644 --- a/extensions/vertico-suspend.el +++ b/extensions/vertico-suspend.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler <m...@daniel-mendler.de> ;; Created: 2023 ;; Version: 1.9 -;; Package-Requires: ((emacs "27.1") (compat "30") (vertico "1.9")) +;; Package-Requires: ((emacs "28.1") (compat "30") (vertico "1.9")) ;; Homepage: https://github.com/minad/vertico ;; This file is part of GNU Emacs. diff --git a/extensions/vertico-unobtrusive.el b/extensions/vertico-unobtrusive.el index 40c8fba2d6..00bc84dcca 100644 --- a/extensions/vertico-unobtrusive.el +++ b/extensions/vertico-unobtrusive.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler <m...@daniel-mendler.de> ;; Created: 2021 ;; Version: 1.9 -;; Package-Requires: ((emacs "27.1") (compat "30") (vertico "1.9")) +;; Package-Requires: ((emacs "28.1") (compat "30") (vertico "1.9")) ;; Homepage: https://github.com/minad/vertico ;; This file is part of GNU Emacs. diff --git a/vertico.el b/vertico.el index 7d92e133bc..163edc4246 100644 --- a/vertico.el +++ b/vertico.el @@ -6,7 +6,7 @@ ;; Maintainer: Daniel Mendler <m...@daniel-mendler.de> ;; Created: 2021 ;; Version: 1.9 -;; Package-Requires: ((emacs "27.1") (compat "30")) +;; Package-Requires: ((emacs "28.1") (compat "30")) ;; Homepage: https://github.com/minad/vertico ;; Keywords: convenience, files, matching, completion @@ -315,7 +315,7 @@ The function is configured by BY, BSIZE, BINDEX, BPRED and PRED." (before (substring content 0 pt)) (after (substring content pt)) ;; bug#47678: `completion-boundaries' fails for `partial-completion' - ;; if the cursor is moved between the slashes of "~//". + ;; if the cursor is moved before the slashes of "~//". ;; See also corfu.el which has the same issue. (bounds (condition-case nil (completion-boundaries before table pred after) @@ -747,7 +747,7 @@ When the prefix argument is 0, the group order is reset." "Return non-nil if Vertico is active in BUFFER." (buffer-local-value 'vertico--input buffer)) -;; Emacs 28: Do not show Vertico commands in M-X +;; Do not show Vertico commands in M-X (dolist (sym '(vertico-next vertico-next-group vertico-previous vertico-previous-group vertico-scroll-down vertico-scroll-up vertico-exit vertico-insert vertico-exit-input vertico-save vertico-first vertico-last