Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2012-09-23 10:17:16 +02:00
commit 7b7e876319
2 changed files with 7 additions and 1 deletions

View File

@ -3547,7 +3547,7 @@ position of point and CDR is nil."
;; They will be parsed as a paragraph. ;; They will be parsed as a paragraph.
(when (looking-at "[ \t]*$") (goto-char origin) (setq output nil)) (when (looking-at "[ \t]*$") (goto-char origin) (setq output nil))
;; Return value. ;; Return value.
(cons (point) output)))) (cons origin output))))

View File

@ -165,6 +165,12 @@ Some other text
:name :name
(org-test-with-temp-text "#+NAME: para\nParagraph" (org-test-with-temp-text "#+NAME: para\nParagraph"
(org-element-at-point))))) (org-element-at-point)))))
(should
(= 1
(org-element-property
:begin
(org-test-with-temp-text "#+NAME: para\nParagraph"
(org-element-at-point)))))
;; Parse multiple keywords. ;; Parse multiple keywords.
(should (should
(equal (equal