Merge branch 'maint'

This commit is contained in:
Bastien 2020-02-02 17:38:37 +01:00
commit f7bb9ec9b3
1 changed files with 2 additions and 1 deletions

View File

@ -9563,7 +9563,8 @@ Called with a universal prefix arg, show the priority instead of setting it."
(while (not (bobp)) (while (not (bobp))
(when (equal marker (org-get-at-bol 'org-marker)) (when (equal marker (org-get-at-bol 'org-marker))
(remove-text-properties (point-at-bol) (point-at-eol) '(display nil)) (remove-text-properties (point-at-bol) (point-at-eol) '(display nil))
(org-move-to-column (- (window-width) (length stamp)) t) (org-move-to-column
(- (/ (window-width nil t) (window-font-width)) (length stamp)) t)
(add-text-properties (add-text-properties
(1- (point)) (point-at-eol) (1- (point)) (point-at-eol)
(list 'display (org-add-props stamp nil (list 'display (org-add-props stamp nil