Make face org-column determine weight, underline, etc.

This used to be enforced despite the settings of or-column.

lisp/org-colview.el

@@ -139,11 +139,8 @@ This is the compiled version of the format.")
 		       (and (eq major-mode 'org-agenda-mode)
 			    (get-text-property (point-at-bol) 'face))
 		       'default))
-	 (color (list :foreground
-		      (face-attribute ref-face :foreground)
-		      :weight 'normal :strike-through nil
-		      :underline nil))
-	 (face (list color 'org-column level-face))
+	 (color (list :foreground (face-attribute ref-face :foreground)))
+	 (face (list color 'org-column ref-face))
 	 pom property ass width f string ov column val modval)
     ;; Check if the entry is in another buffer.
     (unless props

lisp/org-faces.el

@@ -150,11 +150,12 @@ color of the frame."
 (defface org-column
   (org-compatible-face nil
     '((((class color) (min-colors 16) (background light))
-       (:background "grey90"))
+       (:background "grey90" :weight normal :strike-through nil :underline nil))
       (((class color) (min-colors 16) (background dark))
-       (:background "grey30"))
+       (:background "grey30" :weight normal :strike-through nil :underline nil))
       (((class color) (min-colors 8))
-       (:background "cyan" :foreground "black"))
+       (:background "cyan" :foreground "black"
+		    :weight normal :strike-through nil :underline nil))
       (t (:inverse-video t))))
   "Face for column display of entry properties."
   :group 'org-faces)