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-reset.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-reset.el')
| -rw-r--r-- | lisp/magit-reset.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/magit-reset.el b/lisp/magit-reset.el index 4ba560c..e16e9b2 100644 --- a/lisp/magit-reset.el +++ b/lisp/magit-reset.el @@ -61,7 +61,7 @@ "Reset the `HEAD', index, and working tree to COMMIT. \n(git reset --hard REVISION)" (interactive (list (magit-reset-read-branch-or-commit - (concat (propertize "Hard" 'face 'bold) + (concat (magit--propertize-face "Hard" 'bold) " reset %s to")))) (magit-reset-internal "--hard" commit)) @@ -92,7 +92,7 @@ With a prefix argument reset the working tree otherwise don't. \n(git reset --mixed|--hard COMMIT)" (interactive (list (magit-reset-read-branch-or-commit (if current-prefix-arg - (concat (propertize "Hard" 'face 'bold) + (concat (magit--propertize-face "Hard" 'bold) " reset %s to") "Reset %s to")) current-prefix-arg)) |