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 2013-09-11 12:23:42 +02:00
parent aecdf50dc6 af9c0fbf91
commit 44c5aa7315
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/org-element.el
View File

@ -4736,7 +4736,7 @@ first element of current section."
;; In blank lines just after the headline, point still ;; In blank lines just after the headline, point still
;; belongs to the headline. ;; belongs to the headline.
(throw 'exit (throw 'exit
(progn (org-back-to-heading) (progn (skip-chars-backward " \r\t\n")
(if (not keep-trail) (if (not keep-trail)
(org-element-headline-parser (point-max) t) (org-element-headline-parser (point-max) t)
(list (org-element-headline-parser (list (org-element-headline-parser

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

@ -2819,6 +2819,12 @@ Paragraph \\alpha."
(progn (search-forward "A") (progn (search-forward "A")
(org-element-type (org-element-type
(org-element-property :parent (org-element-at-point))))))) (org-element-property :parent (org-element-at-point)))))))
;; Special case: at a blank line just below a headline, return that
;; headline.
(should
(equal "H1" (org-test-with-temp-text "* H1\n \n* H2\n"
(forward-line)
(org-element-property :title (org-element-at-point)))))
;; Special case: at the very beginning of a table, return `table' ;; Special case: at the very beginning of a table, return `table'
;; object instead of `table-row'. ;; object instead of `table-row'.
(should (should