branch: elpa/git-commit
commit 2c91c080a8e2f35e3b036a2f6b8011fa897d23a1
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>
Revert "Ensure hashes and graphs in logs align despite variable-pitch
default"
This reverts commit 1529ee2872a4fe6bad1cf7e43a1baf3353ecde9b.
---
lisp/magit-log.el | 8 +++-----
lisp/magit.el | 22 +++++++++-------------
2 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/lisp/magit-log.el b/lisp/magit-log.el
index 901a299e0c..33809a4108 100644
--- a/lisp/magit-log.el
+++ b/lisp/magit-log.el
@@ -1320,7 +1320,7 @@ Do not add this to a hook variable."
(when align
(insert hash ?\s))
(when graph
- (insert (propertize graph 'font-lock-face 'fixed-pitch)))
+ (insert graph))
(unless align
(insert hash ?\s))
(when (and refs (not magit-log-show-refname-after-summary))
@@ -1376,12 +1376,10 @@ Do not add this to a hook variable."
(delete-char (if (looking-at "\n") 1 4))
(magit-diff-wash-diffs (list "--stat") limit))
(when align
- (setq align (propertize (make-string (1+ abbrev) ?\s)
- 'font-lock-face 'magit-hash)))
+ (setq align (make-string (1+ abbrev) ? )))
(when (and (not (eobp)) (not (looking-at non-graph-re)))
(when align
- (setq align (propertize (make-string (1+ abbrev) ?\s)
- 'font-lock-face 'magit-hash)))
+ (setq align (make-string (1+ abbrev) ? )))
(while (and (not (eobp)) (not (looking-at non-graph-re)))
(when align
(save-excursion (insert align)))
diff --git a/lisp/magit.el b/lisp/magit.el
index 9a3257174b..e352c4c20a 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -111,12 +111,8 @@ own faces for the `header-line', or for parts of the
:group 'magit-faces)
(defface magit-hash
- '((((class color) (background light))
- :inherit fixed-pitch
- :foreground "grey60")
- (((class color) (background dark))
- :inherit fixed-pitch
- :foreground "grey40"))
+ '((((class color) (background light)) :foreground "grey60")
+ (((class color) (background dark)) :foreground "grey40"))
"Face for the commit object name in the log output."
:group 'magit-faces)
@@ -201,37 +197,37 @@ and/or `magit-branch-remote-head'."
:group 'magit-faces)
(defface magit-signature-good
- '((t :inherit fixed-pitch :foreground "green"))
+ '((t :foreground "green"))
"Face for good signatures."
:group 'magit-faces)
(defface magit-signature-bad
- '((t :inherit fixed-pitch :foreground "red" :weight bold))
+ '((t :foreground "red" :weight bold))
"Face for bad signatures."
:group 'magit-faces)
(defface magit-signature-untrusted
- '((t :inherit fixed-pitch :foreground "medium aquamarine"))
+ '((t :foreground "medium aquamarine"))
"Face for good untrusted signatures."
:group 'magit-faces)
(defface magit-signature-expired
- '((t :inherit fixed-pitch :foreground "orange"))
+ '((t :foreground "orange"))
"Face for signatures that have expired."
:group 'magit-faces)
(defface magit-signature-expired-key
- '((t :inherit fixed-pitch :inherit magit-signature-expired))
+ '((t :inherit magit-signature-expired))
"Face for signatures made by an expired key."
:group 'magit-faces)
(defface magit-signature-revoked
- '((t :inherit fixed-pitch :foreground "violet red"))
+ '((t :foreground "violet red"))
"Face for signatures made by a revoked key."
:group 'magit-faces)
(defface magit-signature-error
- '((t :inherit fixed-pitch :foreground "light blue"))
+ '((t :foreground "light blue"))
"Face for signatures that cannot be checked (e.g. missing key)."
:group 'magit-faces)
