[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/git-commit 39fe674: magit-insert-{upstream, push}-branch-h
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/git-commit 39fe674: magit-insert-{upstream, push}-branch-header: Don't propertize whitespace |
Date: |
Fri, 6 Aug 2021 16:57:16 -0400 (EDT) |
branch: elpa/git-commit
commit 39fe674f634507c1588ca197334948cda390a300
Author: Franklin Delehelle <franklin.delehelle@odena.eu>
Commit: Jonas Bernoulli <jonas@bernoul.li>
magit-insert-{upstream,push}-branch-header: Don't propertize whitespace
This is only relevant for themes altering the background color.
---
lisp/magit-status.el | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/lisp/magit-status.el b/lisp/magit-status.el
index a7cad42..3b20d61 100644
--- a/lisp/magit-status.el
+++ b/lisp/magit-status.el
@@ -612,12 +612,13 @@ arguments are for internal use only."
((magit--valid-upstream-p remote merge)
(if (equal remote ".")
(concat
- (propertize merge 'font-lock-face 'magit-branch-local)
- (propertize " does not exist"
+ (propertize merge 'font-lock-face 'magit-branch-local) " "
+ (propertize "does not exist"
'font-lock-face 'font-lock-warning-face))
- (concat
+ (format
+ "%s %s %s"
(propertize merge 'font-lock-face 'magit-branch-remote)
- (propertize " does not exist on "
+ (propertize "does not exist on"
'font-lock-face 'font-lock-warning-face)
(propertize remote 'font-lock-face 'magit-branch-remote))))
(t
@@ -644,11 +645,11 @@ arguments are for internal use only."
"(no commit message)"))))
(let ((remote (magit-get-push-remote branch)))
(if (magit-remote-p remote)
- (concat target
- (propertize " does not exist"
+ (concat target " "
+ (propertize "does not exist"
'font-lock-face 'font-lock-warning-face))
- (concat remote
- (propertize " remote does not exist"
+ (concat remote " "
+ (propertize "remote does not exist"
'font-lock-face 'font-lock-warning-face))))))
(insert ?\n))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [nongnu] elpa/git-commit 39fe674: magit-insert-{upstream, push}-branch-header: Don't propertize whitespace,
ELPA Syncer <=