org-colview: Preserve face for TODO keywords

* lisp/org-colview.el (org-columns-display-here): Preserve face for TODO
  keywords in column view.

Suggested-by: Matt Price <moptop99@gmail.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/99557>

lisp/org-colview.el

@@ -206,9 +206,7 @@ This is the compiled version of the format.")
 	       (val (or (cdr ass) ""))
 	       (modval
 		(cond
-		 ((and org-columns-modify-value-for-display-function
-		       (functionp
-			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))
@@ -222,7 +220,13 @@ 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 (if dateline face1 face))))
+		    (point) (1+ (point))
+		    string
+		    (cond
+		     ((equal property "TODO")
+		      (list (org-get-todo-face val) (if dateline face1 face)))
+		     (dateline face1)
+		     (t face)))))
 	  (overlay-put ov 'keymap org-columns-map)
 	  (overlay-put ov 'org-columns-key property)
 	  (overlay-put ov 'org-columns-value (cdr ass))