summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-06-28 15:55:28 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-06-28 15:55:28 +0200
commita9e53e6172ded341da43a13c4e16cefaee048401 (patch)
tree60872b0476d34ebdb7cb26218acd686e9e3e513c
parent52a5375861cf601eac4c1c409c751a4b50df6b24 (diff)
parent582fc12d0e464e6ca4c697bf03f555e74aea5950 (diff)
downloadorg-mode-a9e53e6172ded341da43a13c4e16cefaee048401.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-agenda.el15
1 files changed, 10 insertions, 5 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 2fd33b3..0a1ba8b 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -6837,11 +6837,16 @@ The optional argument TYPE tells the agenda type."
(list 'face (org-get-todo-face (match-string 2 x)))
x)
(when (match-end 1)
- (setq x (concat (substring x 0 (match-end 1))
- (format org-agenda-todo-keyword-format
- (match-string 2 x))
- (org-add-props " " (text-properties-at 0 x))
- (substring x (match-end 3)))))))
+ (setq x
+ (concat
+ (substring x 0 (match-end 1))
+ (format org-agenda-todo-keyword-format
+ (match-string 2 x))
+ ;; Remove `display' property as the icon could leak
+ ;; on the white space.
+ (org-add-props " " (org-plist-delete (text-properties-at 0 x)
+ 'display))
+ (substring x (match-end 3)))))))
x)))
(defsubst org-cmp-values (a b property)