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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2012-08-25 15:28:40 +02:00
parent 61b5e28509 b4604d2833
commit 1f3d1f55fe
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lisp/org-element.el
View File

@ -1742,9 +1742,15 @@ containing `:begin', `:end', `:contents-begin' and
Assume point is at the beginning of the paragraph." Assume point is at the beginning of the paragraph."
(save-excursion (save-excursion
(let* ((contents-begin (point)) (let* (;; INNER-PAR-P is non-nil when paragraph is at the
(keywords (org-element--collect-affiliated-keywords)) ;; beginning of an item or a footnote reference. In that
(begin (car keywords)) ;; case, we mustn't look for affiliated keywords since they
;; belong to the container.
(inner-par-p (/= (point-at-bol) (point)))
(contents-begin (point))
(keywords (unless inner-par-p
(org-element--collect-affiliated-keywords)))
(begin (if inner-par-p contents-begin (car keywords)))
(before-blank (before-blank
(let ((case-fold-search t)) (let ((case-fold-search t))
(end-of-line) (end-of-line)
@ -1803,7 +1809,7 @@ Assume point is at the beginning of the paragraph."
;; If paragraph has no affiliated keywords, it may not begin ;; If paragraph has no affiliated keywords, it may not begin
;; at beginning of line if it starts an item. ;; at beginning of line if it starts an item.
(nconc (nconc
(list :begin (if (cadr keywords) begin contents-begin) (list :begin begin
:end end :end end
:contents-begin contents-begin :contents-begin contents-begin
:contents-end contents-end :contents-end contents-end

15
testing/lisp/test-org-element.el
View File

@ -1188,7 +1188,20 @@ e^{i\\pi}+1=0
(org-test-with-temp-text "#+BEGIN: \nParagraph" (org-test-with-temp-text "#+BEGIN: \nParagraph"
(let ((elem (org-element-at-point))) (let ((elem (org-element-at-point)))
(and (eq (org-element-type elem) 'paragraph) (and (eq (org-element-type elem) 'paragraph)
(= (point-max) (org-element-property :end elem))))))) (= (point-max) (org-element-property :end elem))))))
;; Include incomplete latex environments.
(should
(org-test-with-temp-text "\begin{equation}\nParagraph"
(let ((elem (org-element-at-point)))
(and (eq (org-element-type elem) 'paragraph)
(= (point-max) (org-element-property :end elem))))))
;; Do not steal affiliated keywords from container.
(should
(org-test-with-temp-text "#+ATTR_LATEX: test\n- item 1"
(let ((elem (progn (search-forward "item") (org-element-at-point))))
(and (eq (org-element-type elem) 'paragraph)
(not (org-element-property :attr_latex elem))
(/= (org-element-property :begin elem) 1))))))
;;;; Plain List ;;;; Plain List