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-bisect.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-bisect.el')
| -rw-r--r-- | lisp/magit-bisect.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/magit-bisect.el b/lisp/magit-bisect.el index 3338f8f..3e54c1c 100644 --- a/lisp/magit-bisect.el +++ b/lisp/magit-bisect.el @@ -187,7 +187,7 @@ bisect run'." (and bad-line (match-string 1 bad-line))) (magit-insert-heading (propertize (or bad-line (pop lines)) - 'face 'magit-section-heading)) + 'font-lock-face 'magit-section-heading)) (dolist (line lines) (insert line "\n")))) (insert "\n"))) @@ -220,7 +220,8 @@ bisect run'." (narrow-to-region beg (point)) (goto-char (point-min)) (magit-insert-section (bisect-item heading t) - (insert (propertize heading 'face 'magit-section-secondary-heading)) + (insert (propertize heading 'font-lock-face + 'magit-section-secondary-heading)) (magit-insert-heading) (magit-wash-sequence (apply-partially 'magit-log-wash-rev 'bisect-log |