transient--make-transient-map: Handle conflicts with keys from maps

If the binding comes from a keymap such as `transient-base-map', then there is no suffix object yet.
magit · Apr 14, 2024 · 2698d62 · 2698d62
1 parent c356d1b
commit 2698d62
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lisp/transient.el b/lisp/transient.el
@@ -1872,7 +1872,8 @@ of the corresponding object."
                  (define-key map kbd cmd))
                 ((eq alt cmd))
                 ((transient--inapt-suffix-p obj))
-                ((transient--inapt-suffix-p (transient-suffix-object alt))
+                ((and-let* ((obj (transient-suffix-object alt)))
+                   (transient--inapt-suffix-p obj))
                  (define-key map kbd cmd))
                 (transient-detect-key-conflicts
                  (error "Cannot bind %S to %s and also %s"