Require Compat 31externals/vertico

13 files changed, 20 insertions, 22 deletions

diff --git a/extensions/vertico-buffer.el b/extensions/vertico-buffer.el
index 9f409f9..34d9c32 100644
--- a/extensions/vertico-buffer.el
+++ b/extensions/vertico-buffer.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2021
 ;; Version: 2.8
-;; Package-Requires: ((emacs "29.1") (compat "30") (vertico "2.8"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (vertico "2.8"))
 ;; URL: 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 3328dd1..4f9b14f 100644
--- a/extensions/vertico-directory.el
+++ b/extensions/vertico-directory.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2021
 ;; Version: 2.8
-;; Package-Requires: ((emacs "29.1") (compat "30") (vertico "2.8"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (vertico "2.8"))
 ;; URL: 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 412fa89..709783e 100644
--- a/extensions/vertico-flat.el
+++ b/extensions/vertico-flat.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2021
 ;; Version: 2.8
-;; Package-Requires: ((emacs "29.1") (compat "30") (vertico "2.8"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (vertico "2.8"))
 ;; URL: 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 1b06405..613c301 100644
--- a/extensions/vertico-grid.el
+++ b/extensions/vertico-grid.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2021
 ;; Version: 2.8
-;; Package-Requires: ((emacs "29.1") (compat "30") (vertico "2.8"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (vertico "2.8"))
 ;; URL: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
@@ -153,7 +153,7 @@ When scrolling beyond this limit, candidates may be truncated."
                          (aref width col)
                          (string-width (or (nth (+ row (* col vertico-count)) cands) ""))))))
     (dotimes (col (1- vertico-grid--columns))
-      (cl-incf (aref width (1+ col)) (+ (aref width col) sep)))
+      (incf (aref width (1+ col)) (+ (aref width col) sep)))
     (cl-loop for row from 0 to (1- (min vertico-count vertico--total)) collect
              (let ((line (list "\n")))
                (cl-loop for col from (1- vertico-grid--columns) downto 0 do
diff --git a/extensions/vertico-indexed.el b/extensions/vertico-indexed.el
index b000a7e..2a64a16 100644
--- a/extensions/vertico-indexed.el
+++ b/extensions/vertico-indexed.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2021
 ;; Version: 2.8
-;; Package-Requires: ((emacs "29.1") (compat "30") (vertico "2.8"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (vertico "2.8"))
 ;; URL: 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 e9e2753..5b6c15d 100644
--- a/extensions/vertico-mouse.el
+++ b/extensions/vertico-mouse.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2021
 ;; Version: 2.8
-;; Package-Requires: ((emacs "29.1") (compat "30") (vertico "2.8"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (vertico "2.8"))
 ;; URL: 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 59620b8..4ca5b86 100644
--- a/extensions/vertico-multiform.el
+++ b/extensions/vertico-multiform.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2021
 ;; Version: 2.8
-;; Package-Requires: ((emacs "29.1") (compat "30") (vertico "2.8"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (vertico "2.8"))
 ;; URL: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
@@ -141,7 +141,7 @@ The keys in LIST can be symbols or regexps."
                 (mode (if (and sym (fboundp sym)) sym x)))
            (when (or (not (symbolp mode)) (not (boundp mode)) (not (symbol-value mode)))
              (push mode modes))))
-        (`(,k . ,v) (set (make-local-variable k) v))
+        (`(,k . ,v) (set-local k v))
         (_ (error "Invalid multiform setting %S" x))))
     (push modes vertico-multiform--stack)
     (vertico-multiform--toggle 1)
diff --git a/extensions/vertico-quick.el b/extensions/vertico-quick.el
index 986e15b..fa534b6 100644
--- a/extensions/vertico-quick.el
+++ b/extensions/vertico-quick.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2021
 ;; Version: 2.8
-;; Package-Requires: ((emacs "29.1") (compat "30") (vertico "2.8"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (vertico "2.8"))
 ;; URL: 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 f2ce8d1..11752c1 100644
--- a/extensions/vertico-repeat.el
+++ b/extensions/vertico-repeat.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2021
 ;; Version: 2.8
-;; Package-Requires: ((emacs "29.1") (compat "30") (vertico "2.8"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (vertico "2.8"))
 ;; URL: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
@@ -186,7 +186,7 @@ selected candidate for the current command."
                             if (eq (car h) vertico-repeat--command) collect h))))
       ((= vertico-repeat--pos 0)
        (setcar vertico-repeat--step (vertico-repeat--current))))
-     (cl-incf n vertico-repeat--pos)
+     (incf n vertico-repeat--pos)
      (when-let* (((>= n 0)) (session (nth n vertico-repeat--step)))
        (setq vertico-repeat--pos n)
        session))))
@@ -230,12 +230,10 @@ previous sessions for the current command."
                   (if current-cmd
                       (format "History of %s: " current-cmd)
                     "Completion history: ")
-                  ;; TODO: Use `completion-table-with-metadata'
-                  (lambda (str pred action)
-                    (if (eq action 'metadata)
-                        '(metadata (display-sort-function . identity)
-                                   (cycle-sort-function . identity))
-                      (complete-with-action action formatted str pred)))
+                  (completion-table-with-metadata
+                   formatted
+                   '((display-sort-function . identity)
+                     (cycle-sort-function . identity)))
                   nil t nil t)
                  formatted)))))
 
diff --git a/extensions/vertico-reverse.el b/extensions/vertico-reverse.el
index 12ae43d..2b44a5a 100644
--- a/extensions/vertico-reverse.el
+++ b/extensions/vertico-reverse.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2021
 ;; Version: 2.8
-;; Package-Requires: ((emacs "29.1") (compat "30") (vertico "2.8"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (vertico "2.8"))
 ;; URL: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/vertico-sort.el b/extensions/vertico-sort.el
index 835c367..924e61c 100644
--- a/extensions/vertico-sort.el
+++ b/extensions/vertico-sort.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2021
 ;; Version: 2.8
-;; Package-Requires: ((emacs "29.1") (compat "30") (vertico "2.8"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (vertico "2.8"))
 ;; URL: 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 80408ae..a26d595 100644
--- a/extensions/vertico-suspend.el
+++ b/extensions/vertico-suspend.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2023
 ;; Version: 2.8
-;; Package-Requires: ((emacs "29.1") (compat "30") (vertico "2.8"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (vertico "2.8"))
 ;; URL: 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 2c003d7..2006f9a 100644
--- a/extensions/vertico-unobtrusive.el
+++ b/extensions/vertico-unobtrusive.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2021
 ;; Version: 2.8
-;; Package-Requires: ((emacs "29.1") (compat "30") (vertico "2.8"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (vertico "2.8"))
 ;; URL: https://github.com/minad/vertico
 
 ;; This file is part of GNU Emacs.