[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/git-commit fb640a8df5 2/2: magit--git-variable: Add defaul
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/git-commit fb640a8df5 2/2: magit--git-variable: Add default slot |
Date: |
Wed, 8 Mar 2023 06:00:56 -0500 (EST) |
branch: elpa/git-commit
commit fb640a8df53902f46ce8824fa5849b46ff12e762
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
magit--git-variable: Add default slot
---
lisp/magit-transient.el | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/lisp/magit-transient.el b/lisp/magit-transient.el
index e1c783015a..7d4fd8c839 100644
--- a/lisp/magit-transient.el
+++ b/lisp/magit-transient.el
@@ -37,12 +37,12 @@
(defclass magit--git-variable (transient-variable)
((scope :initarg :scope)
- (global :initarg :global :initform nil)))
+ (global :initarg :global :initform nil)
+ (default :initarg :default :initform nil)))
(defclass magit--git-variable:choices (magit--git-variable)
((choices :initarg :choices)
- (fallback :initarg :fallback :initform nil)
- (default :initarg :default :initform nil)))
+ (fallback :initarg :fallback :initform nil)))
(defclass magit--git-variable:boolean (magit--git-variable:choices)
((choices :initarg :choices :initform '("true" "false"))))
@@ -158,7 +158,11 @@
(propertize (car value) 'face 'transient-value))
(propertize (car (split-string value "\n"))
'face 'transient-value))
- (propertize "unset" 'face 'transient-inactive-value)))
+ (if-let* ((default (oref obj default))
+ (default (if (functionp default) (funcall default) default)))
+ (concat (propertize "default:" 'face 'transient-inactive-value)
+ (propertize default 'face 'transient-value))
+ (propertize "unset" 'face 'transient-inactive-value))))
(cl-defmethod transient-format-value ((obj magit--git-variable:choices))
(let* ((variable (oref obj variable))