mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-06 02:43:02 +00:00
Merge branch 'master' of orgmode.org:org-mode
This commit is contained in:
commit
1d606c03e1
|
@ -169,8 +169,10 @@ This is the compiled version of the format.")
|
||||||
(get-text-property (point-at-bol) 'face))
|
(get-text-property (point-at-bol) 'face))
|
||||||
'default))
|
'default))
|
||||||
(color (list :foreground (face-attribute ref-face :foreground)))
|
(color (list :foreground (face-attribute ref-face :foreground)))
|
||||||
(face (list color 'org-column ref-face))
|
(font (list :height (face-attribute 'default :height)
|
||||||
(face1 (list color 'org-agenda-column-dateline ref-face))
|
: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))
|
(cphr (get-text-property (point-at-bol) 'org-complex-heading-regexp))
|
||||||
pom property ass width f string ov column val modval s2 title calc)
|
pom property ass width f string ov column val modval s2 title calc)
|
||||||
;; Check if the entry is in another buffer.
|
;; Check if the entry is in another buffer.
|
||||||
|
|
|
@ -217,12 +217,6 @@ column view defines special faces for each outline level. See the file
|
||||||
"Face for column display of entry properties."
|
"Face for column display of entry properties."
|
||||||
:group 'org-faces)
|
: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
|
(defface org-agenda-column-dateline
|
||||||
(org-compatible-face 'org-column
|
(org-compatible-face 'org-column
|
||||||
'((t nil)))
|
'((t nil)))
|
||||||
|
|
Loading…
Reference in a new issue