summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2015-08-06 15:34:56 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2015-08-06 15:34:56 +0200
commitdc1ed4cdccb4e4e9e00688743f3c032da3ad0187 (patch)
tree7902efb07f3645a611b1ebbf1c40d413ff97f4ab
parent4f3b3ce3d9329884e6cb8c7f2a7bc5344b01e36f (diff)
downloadorg-mode-dc1ed4cdccb4e4e9e00688743f3c032da3ad0187.tar.gz
Revert "org-colview: Preserve face for TODO keywords"
This reverts commit 96b4e8f74b6c067b64fd997e953961fc609ac31e. Font leaks on the vertical bar after the keyword.
-rw-r--r--lisp/org-colview.el12
1 files changed, 4 insertions, 8 deletions
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 2dec676..251f425 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -206,7 +206,9 @@ This is the compiled version of the format.")
(val (or (cdr ass) ""))
(modval
(cond
- ((functionp org-columns-modify-value-for-display-function)
+ ((and org-columns-modify-value-for-display-function
+ (functionp
+ org-columns-modify-value-for-display-function))
(funcall org-columns-modify-value-for-display-function
title val))
((equal property "ITEM") (org-columns-compact-links val))
@@ -220,13 +222,7 @@ This is the compiled version of the format.")
(string
(format f (org-columns-add-ellipses (or modval val) width)))
(ov (org-columns-new-overlay
- (point) (1+ (point))
- string
- (cond
- ((equal property "TODO")
- (list (org-get-todo-face val) (if dateline face1 face)))
- (dateline face1)
- (t face)))))
+ (point) (1+ (point)) string (if dateline face1 face))))
(overlay-put ov 'keymap org-columns-map)
(overlay-put ov 'org-columns-key property)
(overlay-put ov 'org-columns-value (cdr ass))