branch: elpa/magit
commit 0f1da8d750879959b641f7765ed45592130420ef
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>
Fix various prompts and messages
---
lisp/magit-blame.el | 2 +-
lisp/magit-branch.el | 4 ++--
lisp/magit-files.el | 2 +-
lisp/magit-process.el | 2 +-
lisp/magit-remote.el | 4 ++--
lisp/magit-sequence.el | 4 ++--
lisp/magit-stash.el | 4 ++--
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lisp/magit-blame.el b/lisp/magit-blame.el
index 3482026d8a..424a8740be 100644
--- a/lisp/magit-blame.el
+++ b/lisp/magit-blame.el
@@ -815,7 +815,7 @@ not turn on `read-only-mode'."
(if-let ((chunk (magit-current-blame-chunk)))
(unless (oref chunk prev-rev)
(user-error "Chunk has no further history"))
- (user-error "Commit data not available yet. Still blaming."))
+ (user-error "Still blaming, commit data not available yet"))
(unless (magit-file-relative-name nil (not magit-buffer-file-name))
(if buffer-file-name
(user-error "Buffer isn't visiting a tracked file")
diff --git a/lisp/magit-branch.el b/lisp/magit-branch.el
index 3d39a6f357..3411046d62 100644
--- a/lisp/magit-branch.el
+++ b/lisp/magit-branch.el
@@ -612,7 +612,7 @@ prompt is confusing."
;; the respective branch name is ambiguous.
(when-let ((ambiguous (seq-filter #'null refs)))
(user-error
- "%s ambiguous. Please cleanup using git directly."
+ "%s ambiguous; please cleanup using git directly"
(let ((len (length ambiguous)))
(cond
((= len 1)
@@ -796,7 +796,7 @@ the remote."
(remote (magit-get-push-remote new)))
(when (and old-target
(not new-target)
- (magit-y-or-n-p (format "Also rename %S to %S on \"%s\""
+ (magit-y-or-n-p (format "Also rename %S to %S on \"%s\"?"
old new remote)))
;; Rename on (i.e., within) the remote, but only if the
;; destination ref doesn't exist yet. If that ref already
diff --git a/lisp/magit-files.el b/lisp/magit-files.el
index 2dbf118984..765979727c 100644
--- a/lisp/magit-files.el
+++ b/lisp/magit-files.el
@@ -210,7 +210,7 @@ is done using `magit-find-index-noselect'."
(let ((file (magit-file-relative-name)))
(unless (equal magit-buffer-refname "{index}")
(user-error "%s isn't visiting the index" file))
- (if (y-or-n-p (format "Update index with contents of %s" (buffer-name)))
+ (if (y-or-n-p (format "Update index with contents of %s?" (buffer-name)))
(let ((index (make-temp-name
(expand-file-name "magit-update-index-" (magit-gitdir))))
(buffer (current-buffer)))
diff --git a/lisp/magit-process.el b/lisp/magit-process.el
index 7c850672ef..201b4b5747 100644
--- a/lisp/magit-process.el
+++ b/lisp/magit-process.el
@@ -923,7 +923,7 @@ respective documentation.
After manually editing ~/.authinfo.gpg you must reset
the cache using
- M-x auth-source-forget-all-cached RET
+ \\`M-x' `auth-source-forget-all-cached' \\`RET'
The above will save you from having to repeatedly type
your token or password, but you might still repeatedly
diff --git a/lisp/magit-remote.el b/lisp/magit-remote.el
index b8b003d9cd..2d23d7cc8a 100644
--- a/lisp/magit-remote.el
+++ b/lisp/magit-remote.el
@@ -281,8 +281,8 @@ Delete the symbolic-ref \"refs/remotes/<remote>/HEAD\"."
newname)
newname "master")))
(cond
- ((y-or-n-p (format "Default branch changed from `%s' to `%s' on %s.%s"
- oldname newname remote " Do the same locally? "))
+ ((y-or-n-p (format "Default branch changed from `%s' to `%s' on %s.%s?"
+ oldname newname remote " Do the same locally"))
(magit--set-default-branch newname oldname)
(magit-refresh))
((user-error "Abort")))))))
diff --git a/lisp/magit-sequence.el b/lisp/magit-sequence.el
index 209b00e894..b1836779fc 100644
--- a/lisp/magit-sequence.el
+++ b/lisp/magit-sequence.el
@@ -811,7 +811,7 @@ START has to be selected from a list of recent commits."
(edit "edit")
(remove "noop\n# pick")
(reword "reword")
- (t (error "unknown action: %s" action)))
+ (t (error "Unknown action: %s" action)))
commit)))
;;;###autoload
@@ -1019,7 +1019,7 @@ status buffer (i.e., the reverse of how they will be
applied)."
(propertize "merge" 'font-lock-face 'magit-sequence-pick)
"\s"
(magit-format-rev-summary hash) "\n"))
- (error "failed to parse merge message hash"))))))
+ (error "Failed to parse merge message hash"))))))
(let ((dir (magit-gitdir)))
(magit-sequence-insert-sequence
(magit-file-line (expand-file-name "rebase-merge/stopped-sha" dir))
diff --git a/lisp/magit-stash.el b/lisp/magit-stash.el
index 45d70c3a4c..dc452d1a0a 100644
--- a/lisp/magit-stash.el
+++ b/lisp/magit-stash.el
@@ -129,8 +129,8 @@ while two prefix arguments are equivalent to `--all'."
(interactive
(progn (when (and (magit-merge-in-progress-p)
(not (magit-y-or-n-p "\
-Stashing and resetting during a merge conflict. \
-Applying the resulting stash won't restore the merge state. \
+Stashing and resetting during a merge conflict. \
+Applying the resulting stash won't restore the merge state. \
Proceed anyway? ")))
(user-error "Abort"))
(magit-stash-read-args)))
