summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Purcell <steve@sanityinc.com>2014-07-12 10:50:38 +0100
committerSteve Purcell <steve@sanityinc.com>2014-07-12 10:50:38 +0100
commit54d31a6e729f2ebd617358087dd0b300d3bc42d1 (patch)
tree796ade16e44d5a2c955b0637d4b91bfdb29740e4
parented692ee9a8c2dc78988f7c905e1f2f5e77c88af8 (diff)
parent66e7d3d00c9e33489aae83d1d4d4aa533de2bb26 (diff)
downloadfork-ledger-54d31a6e729f2ebd617358087dd0b300d3bc42d1.tar.gz
fork-ledger-54d31a6e729f2ebd617358087dd0b300d3bc42d1.tar.bz2
fork-ledger-54d31a6e729f2ebd617358087dd0b300d3bc42d1.zip
Merge pull request #309 from holomorph/master
use inherits for related faces that are the same
-rw-r--r--lisp/ledger-fonts.el21
1 files changed, 10 insertions, 11 deletions
diff --git a/lisp/ledger-fonts.el b/lisp/ledger-fonts.el
index a5f24c41..f5ed6e94 100644
--- a/lisp/ledger-fonts.el
+++ b/lisp/ledger-fonts.el
@@ -35,13 +35,12 @@
:group 'ledger-faces)
(defface ledger-font-payee-cleared-face
- `((t :foreground "#657b83" :weight normal ))
+ `((t :inherit ledger-font-other-face))
"Default face for cleared (*) transactions"
:group 'ledger-faces)
(defface ledger-font-xact-highlight-face
- `((((background dark)) :background "#1a1a1a" )
- (t :background "#eee8d5"))
+ `((t :inherit ledger-occur-xact-face))
"Default face for transaction under point"
:group 'ledger-faces)
@@ -51,7 +50,7 @@
:group 'ledger-faces)
(defface ledger-font-other-face
- `((t :foreground "#657b83" ))
+ `((t :foreground "#657b83" :weight normal))
"Default face for other transactions"
:group 'ledger-faces)
@@ -61,12 +60,12 @@
:group 'ledger-faces)
(defface ledger-font-posting-account-cleared-face
- `((t :foreground "#657b83" ))
+ `((t :inherit ledger-font-other-face))
"Face for Ledger accounts"
:group 'ledger-faces)
(defface ledger-font-posting-account-pending-face
- `((t :foreground "#cb4b16" ))
+ `((t :inherit ledger-font-pending-face))
"Face for Ledger accounts"
:group 'ledger-faces)
@@ -97,17 +96,17 @@
:group 'ledger-faces)
(defface ledger-font-reconciler-uncleared-face
- `((t :foreground "#dc322f" :weight bold ))
+ `((t :inherit ledger-font-payee-uncleared-face))
"Default face for uncleared transactions in the reconcile window"
:group 'ledger-faces)
(defface ledger-font-reconciler-cleared-face
- `((t :foreground "#657b83" :weight normal ))
+ `((t :inherit ledger-font-other-face))
"Default face for cleared (*) transactions in the reconcile window"
:group 'ledger-faces)
(defface ledger-font-reconciler-pending-face
- `((t :foreground "#cb4b16" :weight normal ))
+ `((t :inherit ledger-font-pending-face))
"Default face for pending (!) transactions in the reconcile window"
:group 'ledger-faces)
@@ -122,8 +121,8 @@
;; ledger-font-other-face)
(,ledger-comment-regex 0
'ledger-font-comment-face)
- (,ledger-amount-regex 0
- 'ledger-font-posting-amount-face)
+ (,ledger-amount-regex 0
+ 'ledger-font-posting-amount-face)
(,ledger-multiline-comment-regex 0 'ledger-font-comment-face)
(,ledger-payee-pending-regex 2
'ledger-font-payee-pending-face) ; Works