Require Compat 31externals/corfu

8 files changed, 12 insertions, 11 deletions

diff --git a/corfu.el b/corfu.el
index 026282a..16c1c57 100644
--- a/corfu.el
+++ b/corfu.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2021
 ;; Version: 2.9
-;; Package-Requires: ((emacs "29.1") (compat "30"))
+;; Package-Requires: ((emacs "29.1") (compat "31"))
 ;; URL: https://github.com/minad/corfu
 ;; Keywords: abbrev, convenience, matching, completion, text
 
@@ -398,7 +398,7 @@ the initial completion state.  PREFIX is the minimum prefix length."
       ;;; XXX HACK install mouse ignore map
       (use-local-map corfu--mouse-ignore-map)
       (dolist (var corfu--buffer-parameters)
-        (set (make-local-variable (car var)) (cdr var)))
+        (set-local (car var) (cdr var)))
       (setq-local face-remapping-alist (copy-tree fr)
                   line-spacing ls)
       (cl-pushnew 'corfu-default (alist-get 'default face-remapping-alist))
@@ -499,7 +499,8 @@ FRAME is the existing frame."
                  (size-change (or (/= ow width) (/= oh height))))
       (cond
        ((and pos-change size-change)
-        ;; New Emacs 31 function for faster resizing/movement in one go.
+        ;; TODO: New Emacs 31 function for faster resizing/movement in one go.
+        ;; Add this function to Compat 31 as backport.
         (static-if (fboundp 'set-frame-size-and-position-pixelwise)
             (set-frame-size-and-position-pixelwise frame width height x y)
           (set-frame-size frame width height t)
diff --git a/extensions/corfu-auto.el b/extensions/corfu-auto.el
index 3b39c47..a4d994f 100644
--- a/extensions/corfu-auto.el
+++ b/extensions/corfu-auto.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2022
 ;; Version: 2.9
-;; Package-Requires: ((emacs "29.1") (compat "30") (corfu "2.9"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (corfu "2.9"))
 ;; URL: https://github.com/minad/corfu
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/corfu-echo.el b/extensions/corfu-echo.el
index 17f18ae..6f298bb 100644
--- a/extensions/corfu-echo.el
+++ b/extensions/corfu-echo.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2022
 ;; Version: 2.9
-;; Package-Requires: ((emacs "29.1") (compat "30") (corfu "2.9"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (corfu "2.9"))
 ;; URL: https://github.com/minad/corfu
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/corfu-history.el b/extensions/corfu-history.el
index cfd8526..266f879 100644
--- a/extensions/corfu-history.el
+++ b/extensions/corfu-history.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2022
 ;; Version: 2.9
-;; Package-Requires: ((emacs "29.1") (compat "30") (corfu "2.9"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (corfu "2.9"))
 ;; URL: https://github.com/minad/corfu
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/corfu-indexed.el b/extensions/corfu-indexed.el
index 2f6544d..5003ea8 100644
--- a/extensions/corfu-indexed.el
+++ b/extensions/corfu-indexed.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2022
 ;; Version: 2.9
-;; Package-Requires: ((emacs "29.1") (compat "30") (corfu "2.9"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (corfu "2.9"))
 ;; URL: https://github.com/minad/corfu
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/corfu-info.el b/extensions/corfu-info.el
index af0b984..3b141c6 100644
--- a/extensions/corfu-info.el
+++ b/extensions/corfu-info.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2022
 ;; Version: 2.9
-;; Package-Requires: ((emacs "29.1") (compat "30") (corfu "2.9"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (corfu "2.9"))
 ;; URL: https://github.com/minad/corfu
 
 ;; This file is part of GNU Emacs.
diff --git a/extensions/corfu-popupinfo.el b/extensions/corfu-popupinfo.el
index 2251fee..f9895b2 100644
--- a/extensions/corfu-popupinfo.el
+++ b/extensions/corfu-popupinfo.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2022
 ;; Version: 2.9
-;; Package-Requires: ((emacs "29.1") (compat "30") (corfu "2.9"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (corfu "2.9"))
 ;; URL: https://github.com/minad/corfu
 
 ;; This file is part of GNU Emacs.
@@ -373,7 +373,7 @@ form (X Y WIDTH HEIGHT DIR)."
                 (insert content)
                 (goto-char (point-min)))
               (dolist (var corfu-popupinfo--buffer-parameters)
-                (set (make-local-variable (car var)) (cdr var)))
+                (set-local (car var) (cdr var)))
               (setq left-margin-width corfu-popupinfo-margin-width
                     right-margin-width corfu-popupinfo-margin-width)
               (when-let* ((m (memq 'corfu-default (alist-get 'default face-remapping-alist))))
diff --git a/extensions/corfu-quick.el b/extensions/corfu-quick.el
index 3dbd9bf..21d6e05 100644
--- a/extensions/corfu-quick.el
+++ b/extensions/corfu-quick.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Daniel Mendler <mail@daniel-mendler.de>
 ;; Created: 2022
 ;; Version: 2.9
-;; Package-Requires: ((emacs "29.1") (compat "30") (corfu "2.9"))
+;; Package-Requires: ((emacs "29.1") (compat "31") (corfu "2.9"))
 ;; URL: https://github.com/minad/corfu
 
 ;; This file is part of GNU Emacs.