Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2020-05-31 13:57:05 +02:00
commit fe7830b4f3
2 changed files with 24 additions and 2 deletions

View File

@ -20830,10 +20830,11 @@ ones already marked."
(set-mark
(save-excursion
(goto-char (mark))
(goto-char (org-element-property :end (org-element-at-point)))))
(goto-char (org-element-property :end (org-element-at-point)))
(point)))
(let ((element (org-element-at-point)))
(end-of-line)
(push-mark (org-element-property :end element) t t)
(push-mark (min (point-max) (org-element-property :end element)) t t)
(goto-char (org-element-property :begin element))))))
(defun org-narrow-to-element ()

View File

@ -2787,6 +2787,27 @@ Foo Bar
;;; Mark Region
(ert-deftest test-org/mark-element ()
"Test `org-mark-element' specifications."
;; Mark beginning and end of element.
(should
(equal '(t t)
(org-test-with-temp-text "Para<point>graph"
(org-mark-element)
(list (bobp) (= (mark) (point-max))))))
(should
(equal '(t t)
(org-test-with-temp-text "P1\n\nPara<point>graph\n\nP2"
(org-mark-element)
(list (looking-at "Paragraph")
(org-with-point-at (mark) (looking-at "P2"))))))
;; Do not set mark past (point-max).
(should
(org-test-with-temp-text "Para<point>graph"
(narrow-to-region 2 6)
(org-mark-element)
(= 6 (mark)))))
(ert-deftest test-org/mark-subtree ()
"Test `org-mark-subtree' specifications."
;; Error when point is before first headline.