[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/transient ed5bd6fdc3 23/41: transient-infix-set(argumen
|
From: |
Jonas Bernoulli |
|
Subject: |
[elpa] externals/transient ed5bd6fdc3 23/41: transient-infix-set(argument): Fix disabling incompatible options |
|
Date: |
Sun, 12 Nov 2023 20:04:08 -0500 (EST) |
branch: externals/transient
commit ed5bd6fdc38dc586793315dff1be5c1643c96b4c
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
transient-infix-set(argument): Fix disabling incompatible options
When `argument' is unbound, fall back to `argument-format' instead of
`argument-regexp'. The format can easily be used both as the matcher
and the match candidate, while the regexp is only suitable as matcher.
Fallback from `argument' to `argument-format', not only for the
argument that is being enabled, but also for the arguments that might
have to be disabled in response.
---
lisp/transient.el | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/lisp/transient.el b/lisp/transient.el
index 842aab4d9c..af11c3b7e9 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -3190,16 +3190,18 @@ prompt."
(when-let* ((--- value)
(arg (if (slot-boundp obj 'argument)
(oref obj argument)
- (oref obj argument-regexp)))
+ (oref obj argument-format)))
(spec (oref transient--prefix incompatible))
(incomp (cl-mapcan (lambda (rule)
(and (member arg rule)
(remove arg rule)))
spec)))
(dolist (obj transient--suffixes)
- (when (and (cl-typep obj 'transient-argument)
- (slot-boundp obj 'argument)
- (member (oref obj argument) incomp))
+ (when-let* ((--- (cl-typep obj 'transient-argument))
+ (arg (if (slot-boundp obj 'argument)
+ (oref obj argument)
+ (oref obj argument-format)))
+ (--- (member arg incomp)))
(transient-infix-set obj nil)))))
(cl-defgeneric transient-set-value (obj)
- [elpa] externals/transient 9a7eb0d9a3 09/41: transient--make-predicate-map: Use define-key exclusively, (continued)
- [elpa] externals/transient 9a7eb0d9a3 09/41: transient--make-predicate-map: Use define-key exclusively, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient 67671e1ac0 12/41: transient--make-predicate-map: Rearrange pcase cases, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient 5e841bb24b 19/41: transient-infix-set(argument): Replace :around with :after method, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient c6e3891537 21/41: transient-infix-set(argument): Cosmetics, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient 425003a44b 22/41: transient-infix-set(argument): Limit to other arguments, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient 8d8df0f038 20/41: transient-infix-set(argument): Cosmetics, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient 9d9e931996 25/41: transient--shadowed-buffer: Renamed from transient--current-buffer, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient 8e15a29b59 31/41: transient-format-description: Support function as value of face slot, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient 533578b6b2 32/41: transient-information: Use a space as the fake key, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient 59d8c0342a 18/41: transient--unset-incompatible: Remove unnecessary variable, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient ed5bd6fdc3 23/41: transient-infix-set(argument): Fix disabling incompatible options,
Jonas Bernoulli <=
- [elpa] externals/transient bad91f79ec 29/41: transient-with-shadowed-buffer: Move definition, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient cf32cf6f98 39/41: transient--get-face: Favor face over function, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient 4b9d831d28 10/41: transient--make-predicate-map: Drop obsolete condition, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient 784887b781 14/41: Account for t as transient-suffix for nested prefixes, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient 2eb214a6ec 24/41: transient-infix-set(argument): Also disable based on concrete value, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient 94661e0ccd 34/41: transient--do-replace: Replace with two variants, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient 9617b6c77c 35/41: transient--make-predicate-map: Support shorthands, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient 3a2b936a67 36/41: Fix highlighting infix for which user input is being read, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient 222c2bfbeb 38/41: transient--get-face: New function, Jonas Bernoulli, 2023/11/12
- [elpa] externals/transient 02607dd9d9 04/41: manual: Move comparisons to wiki, Jonas Bernoulli, 2023/11/12