Merge branch 'maint'

This commit is contained in:
Bastien 2020-05-24 14:26:30 +02:00
commit 6f113a5392
1 changed files with 2 additions and 4 deletions

View File

@ -3598,8 +3598,7 @@ removed from the entry content. Currently only `planning' is allowed here."
(when org-agenda-add-entry-text-descriptive-links
(goto-char (point-min))
(while (org-activate-links (point-max))
(add-text-properties (match-beginning 0) (match-end 0)
'(face org-link))))
(goto-char (match-end 0))))
(goto-char (point-min))
(while (re-search-forward org-link-bracket-re (point-max) t)
(set-text-properties (match-beginning 0) (match-end 0)
@ -3864,8 +3863,7 @@ agenda display, configure `org-agenda-finalize-hook'."
(goto-char (point-min))
(save-excursion
(while (org-activate-links (point-max))
(add-text-properties (match-beginning 0) (match-end 0)
'(face org-link))))
(goto-char (match-end 0))))
(unless (eq org-agenda-remove-tags t)
(org-agenda-align-tags))
(unless org-agenda-with-colors