settings, vc: update for keymap-popup 0.2.1

3 files changed, 39 insertions, 39 deletions

diff --git a/lisp/forgejo-settings.el b/lisp/forgejo-settings.el
index f9e726b..52d1720 100644
--- a/lisp/forgejo-settings.el
+++ b/lisp/forgejo-settings.el
@@ -123,34 +123,34 @@ Fetches fresh settings from the API, then opens the popup."
                        host-url owner repo 'website new nil)))))
     (keymap-set forgejo-settings--map "l"
                 (lambda () (interactive)
-                  (keymap-popup 'forgejo-settings--labels-map)))
-    (put 'forgejo-settings--map 'keymap-popup--descriptions
-         (list
+                  (keymap-popup forgejo-settings--labels-map)))
+    (setf (keymap-popup--meta forgejo-settings--map 'keymap-popup--descriptions)
           (list
-           (list :name (format "Settings: %s/%s" owner repo)
-                 :entries
-                 (list
-                  (list :key "d"
-                        :description
-                        (lambda ()
-                          (format "Description  %s"
-                                  (forgejo-settings--format-value
-                                   (truncate-string-to-width
-                                    desc 40 nil nil "..."))))
-                        :type 'suffix
-                        :stay-open t)
-                  (list :key "w"
-                        :description
-                        (lambda ()
-                          (format "Website  %s"
-                                  (forgejo-settings--format-value website)))
-                        :type 'suffix
-                        :stay-open t)
-                  (list :key "l"
-                        :description "Labels"
-                        :type 'keymap
-                        :target 'forgejo-settings--labels-map))))))
-    (keymap-popup 'forgejo-settings--map)))
+           (list
+            (list :name (format "Settings: %s/%s" owner repo)
+                  :entries
+                  (list
+                   (list :key "d"
+                         :description
+                         (lambda ()
+                           (format "Description  %s"
+                                   (forgejo-settings--format-value
+                                    (truncate-string-to-width
+                                     desc 40 nil nil "..."))))
+                         :type 'suffix
+                         :stay-open t)
+                   (list :key "w"
+                         :description
+                         (lambda ()
+                           (format "Website  %s"
+                                   (forgejo-settings--format-value website)))
+                         :type 'suffix
+                         :stay-open t)
+                   (list :key "l"
+                         :description "Labels"
+                         :type 'keymap
+                         :target forgejo-settings--labels-map))))))
+    (keymap-popup forgejo-settings--map)))
 
 ;;; Labels popup
 
@@ -204,15 +204,15 @@ HOST is the hostname for DB lookups."
                         host owner repo name)
                        (message "Deleted label %s from %s/%s"
                                 name owner repo)))))))
-  (put 'forgejo-settings--labels-map 'keymap-popup--descriptions
-       (list
+  (setf (keymap-popup--meta forgejo-settings--labels-map 'keymap-popup--descriptions)
         (list
-         (list :name (format "Labels: %s/%s" owner repo)
-               :entries
-               (list
-                (list :key "a" :description "Create label" :type 'suffix)
-                (list :key "c" :description "Change color" :type 'suffix)
-                (list :key "d" :description "Delete label" :type 'suffix)))))))
+         (list
+          (list :name (format "Labels: %s/%s" owner repo)
+                :entries
+                (list
+                 (list :key "a" :description "Create label" :type 'suffix)
+                 (list :key "c" :description "Change color" :type 'suffix)
+                 (list :key "d" :description "Delete label" :type 'suffix)))))))
 
 ;;; Helpers
 
diff --git a/lisp/forgejo-vc.el b/lisp/forgejo-vc.el
index 2af8e4d..44a8280 100644
--- a/lisp/forgejo-vc.el
+++ b/lisp/forgejo-vc.el
@@ -543,7 +543,7 @@ and mark it as manually merged after a successful push."
   "Forgejo operations for the current repository."
   (interactive)
   (forgejo-vc--fetch-counts)
-  (keymap-popup 'forgejo-vc-map))
+  (keymap-popup forgejo-vc-map))
 
 ;;;###autoload
 (with-eval-after-load 'vc
diff --git a/lisp/forgejo.el b/lisp/forgejo.el
index 0afb945..5ffd4b3 100644
--- a/lisp/forgejo.el
+++ b/lisp/forgejo.el
@@ -6,7 +6,7 @@
 ;; Keywords: tools vc git forgejo
 ;; URL: https://codeberg.org/thanosapollo/emacs-forgejo
 ;; Version: 0.1.1
-;; Package-Requires: ((emacs "29.1") (markdown-mode "2.6") (keymap-popup "0.1.0"))
+;; Package-Requires: ((emacs "29.1") (markdown-mode "2.6") (keymap-popup "0.2.1"))
 
 ;; This program is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
@@ -315,7 +315,7 @@ Resolution order: inline token from `forgejo-hosts', auth-source,
 (defun forgejo ()
   "Forgejo."
   (interactive)
-  (keymap-popup 'forgejo-map))
+  (keymap-popup forgejo-map))
 
 (defun forgejo-browse-repo ()
   "Open a repository in the browser."
@@ -342,7 +342,7 @@ Resolution order: inline token from `forgejo-hosts', auth-source,
 (defun forgejo-repo-action-at-point ()
   "Actions for repository at point."
   (interactive)
-  (keymap-popup 'forgejo-repo-action-map))
+  (keymap-popup forgejo-repo-action-map))
 
 (defun forgejo-repo-action--issues ()
   "List issues for the repo at point."