Merge branch 'maint'
This commit is contained in:
commit
405d82ed38
|
@ -7146,12 +7146,12 @@ The optional argument TYPE tells the agenda type."
|
||||||
(substring x 0 (match-end 1))
|
(substring x 0 (match-end 1))
|
||||||
(unless (string-empty-p org-agenda-todo-keyword-format)
|
(unless (string-empty-p org-agenda-todo-keyword-format)
|
||||||
(format org-agenda-todo-keyword-format
|
(format org-agenda-todo-keyword-format
|
||||||
(match-string 2 x))
|
(match-string 2 x)))
|
||||||
;; Remove `display' property as the icon could leak
|
;; Remove `display' property as the icon could leak
|
||||||
;; on the white space.
|
;; on the white space.
|
||||||
(org-add-props " " (org-plist-delete (text-properties-at 0 x)
|
(org-add-props " " (org-plist-delete (text-properties-at 0 x)
|
||||||
'display)))
|
'display)))
|
||||||
(substring x (match-end 3)))))))
|
(substring x (match-end 3))))))
|
||||||
x)))
|
x)))
|
||||||
|
|
||||||
(defsubst org-cmp-values (a b property)
|
(defsubst org-cmp-values (a b property)
|
||||||
|
|
Loading…
Reference in New Issue