diff options
| author | Noam Postavsky <npostavs@users.sourceforge.net> | 2019-04-19 10:20:23 -0400 |
|---|---|---|
| committer | Jonas Bernoulli <jonas@bernoul.li> | 2019-07-30 16:19:40 +0200 |
| commit | 27c4d7aed72f3c51321ba6ae13952f4c4abea94e (patch) | |
| tree | be1bb35a32fa27f4e0aa1b6e31a757681a5d01eb /lisp/magit-remote.el | |
| parent | 33fa416fc7643a8be4fa0216184fbef81157e885 (diff) | |
Make magit-mode compatible with whitespace-mode
* Continue to use only `face' for strings that will be used by
Transient, and for `read-char-choice' prompts.
* Also leave `git-commit-propertize-diff' along because it already
does face/font-lock-face conversion at runtime.
* Otherwise when returning a string use `face' AND `font-lock-face'.
This is done using the new functions `magit--propertize-face' and
`magit--put-face'.
Diffstat (limited to 'lisp/magit-remote.el')
| -rw-r--r-- | lisp/magit-remote.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/magit-remote.el b/lisp/magit-remote.el index 54a7983..0e6a82f 100644 --- a/lisp/magit-remote.el +++ b/lisp/magit-remote.el @@ -316,10 +316,11 @@ Delete the symbolic-ref \"refs/remotes/<remote>/HEAD\"." (defun magit--push-remote-variable (&optional branch short) (unless branch (setq branch (magit-get-current-branch))) - (propertize (if (or (not branch) magit-prefer-push-default) - (if short "pushDefault" "remote.pushDefault") - (if short "pushRemote" (format "branch.%s.pushRemote" branch))) - 'face 'bold)) + (magit--propertize-face + (if (or (not branch) magit-prefer-push-default) + (if short "pushDefault" "remote.pushDefault") + (if short "pushRemote" (format "branch.%s.pushRemote" branch))) + 'bold)) (defun magit--select-push-remote (prompt-suffix) (let* ((branch (or (magit-get-current-branch) |