branch: elpa/magit
commit 6a695e68eb4de8775af09ebf24da08ea809f8abd
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Use radio custom type to allow selecting a function
---
lisp/git-commit.el | 16 ++++++++--------
lisp/magit-log.el | 14 +++++++-------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index fbd5aa3175..e9e4c14c78 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -174,14 +174,14 @@ full loading."
The major mode configured here is turned on by the minor mode
`git-commit-mode'."
:group 'git-commit
- :type '(choice (function-item text-mode)
- (function-item markdown-mode)
- (function-item org-mode)
- (function-item fundamental-mode)
- (function-item log-edit-mode)
- (function-item git-commit-elisp-text-mode)
- (function :tag "Another mode")
- (const :tag "No major mode")))
+ :type '(radio (function-item text-mode)
+ (function-item markdown-mode)
+ (function-item org-mode)
+ (function-item fundamental-mode)
+ (function-item log-edit-mode)
+ (function-item git-commit-elisp-text-mode)
+ (function :tag "Another major mode")
+ (const :tag "No major mode")))
;;;###autoload(put 'git-commit-major-mode 'safe-local-variable
;;;###autoload (lambda (val)
;;;###autoload (memq val '(text-mode
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index 92b5f8b32d..6dbf8b4e4c 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -174,9 +174,9 @@ want to use the same functions for both hooks."
"Function used to generate text shown in header line of log buffers."
:package-version '(magit . "2.12.0")
:group 'magit-log
- :type `(choice (function-item ,#'magit-log-header-line-arguments)
- (function-item ,#'magit-log-header-line-sentence)
- function))
+ :type `(radio (function-item ,#'magit-log-header-line-arguments)
+ (function-item ,#'magit-log-header-line-sentence)
+ function))
(defcustom magit-log-trace-definition-function #'magit-which-function
"Function used to determine the function at point.
@@ -185,10 +185,10 @@ You should prefer `magit-which-function' over
`which-function'
because the latter may make use of Imenu's outdated cache."
:package-version '(magit . "3.0.0")
:group 'magit-log
- :type `(choice (function-item ,#'magit-which-function)
- (function-item ,#'which-function)
- (function-item ,#'add-log-current-defun)
- function))
+ :type `(radio (function-item ,#'magit-which-function)
+ (function-item ,#'which-function)
+ (function-item ,#'add-log-current-defun)
+ function))
(defcustom magit-log-color-graph-limit 256
"Number of commits over which log graphs are not colored.
