Merge branch 'master' into ledger-mode-bug-1063-auto-refresh-reports

This commit is contained in:
Craig Earls 2014-07-12 21:35:55 -07:00
commit fc2700daa9

View file

@ -35,13 +35,12 @@
:group 'ledger-faces) :group 'ledger-faces)
(defface ledger-font-payee-cleared-face (defface ledger-font-payee-cleared-face
`((t :foreground "#657b83" :weight normal )) `((t :inherit ledger-font-other-face))
"Default face for cleared (*) transactions" "Default face for cleared (*) transactions"
:group 'ledger-faces) :group 'ledger-faces)
(defface ledger-font-xact-highlight-face (defface ledger-font-xact-highlight-face
`((((background dark)) :background "#1a1a1a" ) `((t :inherit ledger-occur-xact-face))
(t :background "#eee8d5"))
"Default face for transaction under point" "Default face for transaction under point"
:group 'ledger-faces) :group 'ledger-faces)
@ -51,7 +50,7 @@
:group 'ledger-faces) :group 'ledger-faces)
(defface ledger-font-other-face (defface ledger-font-other-face
`((t :foreground "#657b83" )) `((t :foreground "#657b83" :weight normal))
"Default face for other transactions" "Default face for other transactions"
:group 'ledger-faces) :group 'ledger-faces)
@ -61,12 +60,12 @@
:group 'ledger-faces) :group 'ledger-faces)
(defface ledger-font-posting-account-cleared-face (defface ledger-font-posting-account-cleared-face
`((t :foreground "#657b83" )) `((t :inherit ledger-font-other-face))
"Face for Ledger accounts" "Face for Ledger accounts"
:group 'ledger-faces) :group 'ledger-faces)
(defface ledger-font-posting-account-pending-face (defface ledger-font-posting-account-pending-face
`((t :foreground "#cb4b16" )) `((t :inherit ledger-font-pending-face))
"Face for Ledger accounts" "Face for Ledger accounts"
:group 'ledger-faces) :group 'ledger-faces)
@ -97,17 +96,17 @@
:group 'ledger-faces) :group 'ledger-faces)
(defface ledger-font-reconciler-uncleared-face (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" "Default face for uncleared transactions in the reconcile window"
:group 'ledger-faces) :group 'ledger-faces)
(defface ledger-font-reconciler-cleared-face (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" "Default face for cleared (*) transactions in the reconcile window"
:group 'ledger-faces) :group 'ledger-faces)
(defface ledger-font-reconciler-pending-face (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" "Default face for pending (!) transactions in the reconcile window"
:group 'ledger-faces) :group 'ledger-faces)
@ -122,8 +121,8 @@
;; ledger-font-other-face) ;; ledger-font-other-face)
(,ledger-comment-regex 0 (,ledger-comment-regex 0
'ledger-font-comment-face) 'ledger-font-comment-face)
(,ledger-amount-regex 0 (,ledger-amount-regex 0
'ledger-font-posting-amount-face) 'ledger-font-posting-amount-face)
(,ledger-multiline-comment-regex 0 'ledger-font-comment-face) (,ledger-multiline-comment-regex 0 'ledger-font-comment-face)
(,ledger-payee-pending-regex 2 (,ledger-payee-pending-regex 2
'ledger-font-payee-pending-face) ; Works 'ledger-font-payee-pending-face) ; Works