[elpa] externals/org 5a1a1eb 4/6: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit 5a1a1ebdebc2fb1f7db27602e584db9f7f5fb979
Merge: f98e3ef 06c064e
Author: Bastien <bzg@gnu.org>
Commit: Bastien <bzg@gnu.org>

    Merge branch 'maint'
---
 lisp/org-agenda.el | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index cbae3c0..b45b855 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -7144,12 +7144,13 @@ The optional argument TYPE tells the agenda type."
            (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))
+                   (unless (string-empty-p org-agenda-todo-keyword-format)
+                    (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)))