forked from mirrors/org-mode
Merge branch 'maint'
Conflicts: testing/lisp/test-org-element.el
This commit is contained in:
commit
95dd398f6a
|
@ -1261,8 +1261,7 @@ Assume point is at the beginning of the list."
|
||||||
(unless (bolp) (forward-line))
|
(unless (bolp) (forward-line))
|
||||||
(point)))
|
(point)))
|
||||||
(end (progn (skip-chars-forward " \r\t\n" limit)
|
(end (progn (skip-chars-forward " \r\t\n" limit)
|
||||||
(skip-chars-backward " \t")
|
(if (= (point) limit) limit (line-beginning-position)))))
|
||||||
(if (bolp) (point) (line-end-position)))))
|
|
||||||
;; Return value.
|
;; Return value.
|
||||||
(list 'plain-list
|
(list 'plain-list
|
||||||
(nconc
|
(nconc
|
||||||
|
|
|
@ -1511,7 +1511,12 @@ Outside list"
|
||||||
;; Move to ending of outer list.
|
;; Move to ending of outer list.
|
||||||
(progn (goto-char (car endings)) (looking-at "Outside list"))
|
(progn (goto-char (car endings)) (looking-at "Outside list"))
|
||||||
;; Move to ending of inner list.
|
;; Move to ending of inner list.
|
||||||
(progn (goto-char (nth 1 endings)) (looking-at "^$"))))))))
|
(progn (goto-char (nth 1 endings)) (looking-at "^$")))))))
|
||||||
|
;; Correctly compute end of list if it doesn't end at a line
|
||||||
|
;; beginning.
|
||||||
|
(should
|
||||||
|
(org-test-with-temp-text "- list\n \n "
|
||||||
|
(= (org-element-property :end (org-element-at-point)) (point-max)))))
|
||||||
|
|
||||||
|
|
||||||
;;;; Planning
|
;;;; Planning
|
||||||
|
|
Loading…
Reference in a new issue