branch: elpa/magit
commit ec036ccdcf00a91f531c7bb1fda93425e713ee07
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Consistently begin custom choice tags with capital letter
---
lisp/magit-base.el | 16 ++++++++--------
lisp/magit-branch.el | 14 +++++++-------
lisp/magit-clone.el | 12 ++++++------
lisp/magit-diff.el | 14 +++++++-------
lisp/magit-log.el | 8 ++++----
lisp/magit-mode.el | 16 ++++++++--------
lisp/magit-patch.el | 6 +++---
lisp/magit-process.el | 6 +++---
lisp/magit-remote.el | 8 ++++----
lisp/magit-status.el | 14 +++++++-------
10 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/lisp/magit-base.el b/lisp/magit-base.el
index 96aba336a9b..91b592651e2 100644
--- a/lisp/magit-base.el
+++ b/lisp/magit-base.el
@@ -129,11 +129,11 @@ The value has the form ((COMMAND nil|PROMPT DEFAULT)...).
:group 'magit-commands
:type '(repeat
(list (symbol :tag "Command") ; It might not be fboundp yet.
- (choice (const :tag "for all prompts" nil)
- (regexp :tag "for prompts matching regexp"))
- (choice (const :tag "offer other choices" nil)
- (const :tag "require confirmation" ask)
- (const :tag "use default without confirmation" t)))))
+ (choice (const :tag "For all prompts" nil)
+ (regexp :tag "For prompts matching regexp"))
+ (choice (const :tag "Offer other choices" nil)
+ (const :tag "Require confirmation" ask)
+ (const :tag "Use default without confirmation" t)))))
(defconst magit--confirm-actions
'((const discard)
@@ -467,9 +467,9 @@ and delay of your graphical environment or operating
system."
`woman' View the respective man-page using the `woman' package."
:package-version '(magit . "2.9.0")
:group 'magit-miscellaneous
- :type '(choice (const :tag "view info manual" info)
- (const :tag "view manpage using `man'" man)
- (const :tag "view manpage using `woman'" woman)))
+ :type '(choice (const :tag "View info manual" info)
+ (const :tag "View manpage using `man'" man)
+ (const :tag "View manpage using `woman'" woman)))
;;; Section Classes
diff --git a/lisp/magit-branch.el b/lisp/magit-branch.el
index 3411046d620..e373c28124e 100644
--- a/lisp/magit-branch.el
+++ b/lisp/magit-branch.el
@@ -46,9 +46,9 @@
new branch and continue by reading the upstream next."
:package-version '(magit . "2.2.0")
:group 'magit-commands
- :type '(choice (const :tag "read branch name first" nil)
- (const :tag "read upstream first" t)
- (const :tag "read upstream first, with fallback" fallback)))
+ :type '(choice (const :tag "Read branch name first" nil)
+ (const :tag "Read upstream first" t)
+ (const :tag "Read upstream first, with fallback" fallback)))
(defcustom magit-branch-prefer-remote-upstream nil
"Whether to favor remote upstreams when creating new branches.
@@ -154,10 +154,10 @@ However, I recommend that you use local branches as
UPSTREAM."
:package-version '(magit . "2.9.0")
:group 'magit-commands
:type '(repeat (cons (string :tag "Use upstream")
- (choice :tag "for branches"
- (regexp :tag "matching")
- (repeat :tag "except"
- (string :tag "branch"))))))
+ (choice :tag "For branches" ;???
+ (regexp :tag "Matching")
+ (repeat :tag "Except"
+ (string :tag "Branch"))))))
(defcustom magit-branch-rename-push-target t
"Whether the push-remote setup is preserved when renaming a branch.
diff --git a/lisp/magit-clone.el b/lisp/magit-clone.el
index f7704369b9a..42187eb3c67 100644
--- a/lisp/magit-clone.el
+++ b/lisp/magit-clone.el
@@ -43,9 +43,9 @@ If t, then set without asking. If nil, then don't set. If
`ask', then ask."
:package-version '(magit . "2.4.0")
:group 'magit-commands
- :type '(choice (const :tag "set" t)
- (const :tag "ask" ask)
- (const :tag "don't set" nil)))
+ :type '(choice (const :tag "Set" t)
+ (const :tag "Ask" ask)
+ (const :tag "Don't set" nil)))
(defcustom magit-clone-default-directory nil
"Default directory to use when `magit-clone' reads destination.
@@ -54,9 +54,9 @@ If a directory, then use that. If a function, then call that
with the remote url as only argument and use the returned value."
:package-version '(magit . "2.90.0")
:group 'magit-commands
- :type '(choice (const :tag "value of default-directory")
- (directory :tag "constant directory")
- (function :tag "function's value")))
+ :type '(choice (const :tag "Value of default-directory")
+ (directory :tag "Constant directory")
+ (function :tag "Function's value")))
(defcustom magit-clone-always-transient nil
"Whether `magit-clone' always acts as a transient prefix command.
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index 886877080e6..cf98b2a07ca 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -272,9 +272,9 @@ whitespace errors are highlighted."
:package-version '(magit . "3.0.0")
:group 'magit-diff
:safe (lambda (val) (memq val '(t both all)))
- :type '(choice (const :tag "in added lines" t)
- (const :tag "in added and removed lines" both)
- (const :tag "in added, removed and context lines" all)))
+ :type '(choice (const :tag "In added lines" t)
+ (const :tag "In added and removed lines" both)
+ (const :tag "In added, removed and context lines" all)))
(defcustom magit-diff-highlight-trailing t
"Whether to highlight whitespace at the end of a line in diffs.
@@ -421,10 +421,10 @@ See user option
`magit-revision-insert-related-refs-display-alist'
to hide specific sets of related branches."
:package-version '(magit . "2.1.0")
:group 'magit-revision
- :type '(choice (const :tag "don't" nil)
- (const :tag "local only" t)
- (const :tag "all related" all)
- (const :tag "all containing, local merged" mixed)))
+ :type '(choice (const :tag "Do not" nil)
+ (const :tag "Local only" t)
+ (const :tag "All related" all)
+ (const :tag "All containing, local merged" mixed)))
(defcustom magit-revision-insert-related-refs-display-alist nil
"How `magit-insert-revision-headers' displays related branch types.
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index 9a2e46a6ab1..8ad1b56b159 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -262,10 +262,10 @@ The message can be shown in the `echo-area' or the
`header-line', or in
be nil, in which case no usage information is shown."
:package-version '(magit . "2.1.0")
:group 'magit-log
- :type '(choice (const :tag "in echo-area" echo-area)
- (const :tag "in header-line" header-line)
- (const :tag "in both places" both)
- (const :tag "nowhere")))
+ :type '(choice (const :tag "In echo-area" echo-area)
+ (const :tag "In header-line" header-line)
+ (const :tag "In both places" both)
+ (const :tag "Nowhere")))
(defcustom magit-log-select-margin
(list (nth 0 magit-log-margin)
diff --git a/lisp/magit-mode.el b/lisp/magit-mode.el
index 567e2d3a8aa..5f930ee736f 100644
--- a/lisp/magit-mode.el
+++ b/lisp/magit-mode.el
@@ -234,10 +234,10 @@ and Buffer Variables'."
:group 'magit-diff
:group 'magit-log
:type '(choice
- (const :tag "always use args from buffer" always)
- (const :tag "use args from buffer if displayed in frame" selected)
- (const :tag "use args from buffer if it is current" current)
- (const :tag "never use args from buffer" never)))
+ (const :tag "Always use args from buffer" always)
+ (const :tag "Use args from buffer if displayed in frame" selected)
+ (const :tag "Use args from buffer if it is current" current)
+ (const :tag "Never use args from buffer" never)))
(defcustom magit-direct-use-buffer-arguments 'selected
"Whether certain commands reuse arguments active in relevant buffer.
@@ -267,10 +267,10 @@ and Buffer Variables'."
:group 'magit-diff
:group 'magit-log
:type '(choice
- (const :tag "always use args from buffer" always)
- (const :tag "use args from buffer if displayed in frame" selected)
- (const :tag "use args from buffer if it is current" current)
- (const :tag "never use args from buffer" never)))
+ (const :tag "Always use args from buffer" always)
+ (const :tag "Use args from buffer if displayed in frame" selected)
+ (const :tag "Use args from buffer if it is current" current)
+ (const :tag "Never use args from buffer" never)))
(defcustom magit-region-highlight-hook
'(magit-diff-update-hunk-region) ; from magit-diff.el
diff --git a/lisp/magit-patch.el b/lisp/magit-patch.el
index 4c6bba86ae0..88641d51478 100644
--- a/lisp/magit-patch.el
+++ b/lisp/magit-patch.el
@@ -40,12 +40,12 @@ a constant list of arguments, depending on this option and
the prefix argument."
:package-version '(magit . "2.12.0")
:group 'magit-diff
- :type '(choice (const :tag "use buffer arguments" buffer)
- (cons :tag "use buffer arguments except"
+ :type '(choice (const :tag "Use buffer arguments" buffer)
+ (cons :tag "Use buffer arguments except"
(const :format "" exclude)
(repeat :format "%v%i\n"
(string :tag "Argument")))
- (repeat :tag "use constant arguments"
+ (repeat :tag "Use constant arguments"
(string :tag "Argument"))))
;;; Commands
diff --git a/lisp/magit-process.el b/lisp/magit-process.el
index 201b4b5747d..bc4c0ce7c8b 100644
--- a/lisp/magit-process.el
+++ b/lisp/magit-process.el
@@ -49,8 +49,8 @@
If nil, use pipes: this is usually more efficient, and works on Cygwin.
If t, use ptys: this enables Magit to prompt for passphrases when needed."
:group 'magit-process
- :type '(choice (const :tag "pipe" nil)
- (const :tag "pty" t)))
+ :type '(choice (const :tag "Pipe" nil)
+ (const :tag "Pty" t)))
(defcustom magit-need-cygwin-noglob
(and (eq system-type 'windows-nt)
@@ -257,7 +257,7 @@ process section in the process buffer, and insert the
returned
string in the heading of its section."
:package-version '(magit . "4.0.0")
:group 'magit-process
- :type '(choice (const :tag "none" nil) string))
+ :type '(choice (const :tag "None" nil) string))
(defvar tramp-pipe-stty-settings)
(defvar magit-tramp-pipe-stty-settings ""
diff --git a/lisp/magit-remote.el b/lisp/magit-remote.el
index 2d23d7cc8a4..b5fdbf28a08 100644
--- a/lisp/magit-remote.el
+++ b/lisp/magit-remote.el
@@ -40,10 +40,10 @@ the name of the added remote is equal to that string and the
variable isn't already set."
:package-version '(magit . "2.4.0")
:group 'magit-commands
- :type '(choice (const :tag "ask if unset" ask-if-unset)
- (const :tag "always ask" ask)
- (string :tag "set if named")
- (const :tag "don't set")))
+ :type '(choice (const :tag "Ask if unset" ask-if-unset)
+ (const :tag "Always ask" ask)
+ (string :tag "Set if named")
+ (const :tag "Don't set")))
(defcustom magit-remote-direct-configure t
"Whether the command `magit-remote' shows Git variables.
diff --git a/lisp/magit-status.el b/lisp/magit-status.el
index 494c940b268..2b90b21d89b 100644
--- a/lisp/magit-status.el
+++ b/lisp/magit-status.el
@@ -109,9 +109,9 @@ See option `magit-section-initial-visibility-alist' for how
to
control the initial visibility of the jumped to section."
:package-version '(magit . "2.90.0")
:group 'magit-status
- :type '(choice (const :tag "as usual" nil)
- (repeat (choice (number :tag "nth top-level section")
- (sexp :tag "section identity")))))
+ :type '(choice (const :tag "As usual" nil)
+ (repeat (choice (number :tag "Nth top-level section")
+ (sexp :tag "Section identity")))))
(defcustom magit-status-goto-file-position nil
"Whether to go to position corresponding to file position.
@@ -237,10 +237,10 @@ Valid values are:
:group 'magit-buffers
:group 'magit-commands
:type '(choice
- (const :tag "always use args from buffer" always)
- (const :tag "use args from buffer if displayed in frame" selected)
- (const :tag "use args from buffer if it is current" current)
- (const :tag "never use args from buffer" never)))
+ (const :tag "Always use args from buffer" always)
+ (const :tag "Use args from buffer if displayed in frame" selected)
+ (const :tag "Use args from buffer if it is current" current)
+ (const :tag "Never use args from buffer" never)))
;;; Commands
