branch: externals/transient
commit 2698d62d2e209023d5cf11ec4190aaa751f40bbe
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>
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.
---
lisp/transient.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lisp/transient.el b/lisp/transient.el
index 6fdb108a27..ea55753222 100644
--- 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"
