ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Kaushal Modi 2019-01-04 08:59:10 -05:00
parent 7db8ebc1df 539091799b
commit b334a59902
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/org.el
View File

@ -14235,8 +14235,10 @@ visible part of the buffer."
(org--align-tags-here (funcall get-indent-column)) (org--align-tags-here (funcall get-indent-column))
(save-excursion (save-excursion
(if all (if all
(while (re-search-forward org-tag-line-re nil t) (progn
(org--align-tags-here (funcall get-indent-column))) (goto-char (point-min))
(while (re-search-forward org-tag-line-re nil t)
(org--align-tags-here (funcall get-indent-column))))
(org-back-to-heading t) (org-back-to-heading t)
(org--align-tags-here (funcall get-indent-column))))))) (org--align-tags-here (funcall get-indent-column)))))))

16
testing/lisp/test-org.el
View File

@ -6121,7 +6121,21 @@ Paragraph<point>"
(let ((org-tags-column 78) (let ((org-tags-column 78)
(indent-tabs-mode nil)) (indent-tabs-mode nil))
(org-fix-tags-on-the-fly)) (org-fix-tags-on-the-fly))
(current-column))))) (current-column))))
;; Aligning all tags in visible buffer.
(should
;; 12345678901234567890
(equal (concat "* Level 1 :abc:\n"
"** Level 2 :def:")
(org-test-with-temp-text (concat "* Level 1 :abc:\n"
"** Level 2 :def:")
(let ((org-tags-column -20)
(indent-tabs-mode nil))
;; (org-align-tags :all) must work even when the point
;; is at the end of the buffer.
(goto-char (point-max))
(org-align-tags :all))
(buffer-string)))))
(ert-deftest test-org/get-tags () (ert-deftest test-org/get-tags ()
"Test `org-get-tags' specifications." "Test `org-get-tags' specifications."