diff options
author | Bastien Guerry <bzg@altern.org> | 2013-06-29 07:39:50 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-06-29 07:39:50 +0200 |
commit | 1d606c03e1db3d6e23e5775d74c58dcfcf2b6a64 (patch) | |
tree | cd50bf2759fb1552045d687d21aa33f8b8586f0f | |
parent | 5a36318511f5696c03b21cba0992b05c1e6d97dd (diff) | |
parent | 91a4c8fb1a2847cd914e44e5730bd67d3c3dd92a (diff) | |
download | org-mode-1d606c03e1db3d6e23e5775d74c58dcfcf2b6a64.tar.gz |
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r-- | lisp/org-colview.el | 6 | ||||
-rw-r--r-- | lisp/org-faces.el | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/lisp/org-colview.el b/lisp/org-colview.el index a98deec..f3b8e42 100644 --- a/lisp/org-colview.el +++ b/lisp/org-colview.el @@ -169,8 +169,10 @@ This is the compiled version of the format.") (get-text-property (point-at-bol) 'face)) 'default)) (color (list :foreground (face-attribute ref-face :foreground))) - (face (list color 'org-column ref-face)) - (face1 (list color 'org-agenda-column-dateline ref-face)) + (font (list :height (face-attribute 'default :height) + :family (face-attribute 'default :family))) + (face (list color font 'org-column ref-face)) + (face1 (list color font 'org-agenda-column-dateline ref-face)) (cphr (get-text-property (point-at-bol) 'org-complex-heading-regexp)) pom property ass width f string ov column val modval s2 title calc) ;; Check if the entry is in another buffer. diff --git a/lisp/org-faces.el b/lisp/org-faces.el index 5472964..e968657 100644 --- a/lisp/org-faces.el +++ b/lisp/org-faces.el @@ -217,12 +217,6 @@ column view defines special faces for each outline level. See the file "Face for column display of entry properties." :group 'org-faces) -(when (fboundp 'set-face-attribute) - ;; Make sure that a fixed-width face is used when we have a column table. - (set-face-attribute 'org-column nil - :height (face-attribute 'default :height) - :family (face-attribute 'default :family))) - (defface org-agenda-column-dateline (org-compatible-face 'org-column '((t nil))) |