Merge branch 'maint'

lisp/org.el

@@ -14235,8 +14235,10 @@ visible part of the buffer."
 	(org--align-tags-here (funcall get-indent-column))
       (save-excursion
 	(if all
-	    (while (re-search-forward org-tag-line-re nil t)
-	      (org--align-tags-here (funcall get-indent-column)))
+	    (progn
+	      (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--align-tags-here (funcall get-indent-column)))))))
 

testing/lisp/test-org.el

@@ -6121,7 +6121,21 @@ Paragraph<point>"
 	  (let ((org-tags-column 78)
 		(indent-tabs-mode nil))
 	    (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 ()
   "Test `org-get-tags' specifications."