branch: externals/org
commit 53b5af21fd26d530b85af147477ba671dc84554a
Merge: fdd7072 8846ea7
Author: Nicolas Goaziou <[email protected]>
Commit: Nicolas Goaziou <[email protected]>
Merge branch 'maint'
---
lisp/org-element.el | 4 +++-
testing/lisp/test-org-element.el | 3 +++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/lisp/org-element.el b/lisp/org-element.el
index a675bf5..ba4f0ea 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -737,7 +737,9 @@ Return a list whose CAR is `drawer' and CDR is a plist
containing
Assume point is at beginning of drawer."
(let ((case-fold-search t))
- (if (not (save-excursion (re-search-forward "^[ \t]*:END:[ \t]*$" limit
t)))
+ (if (not (save-excursion
+ (goto-char (min limit (line-end-position)))
+ (re-search-forward "^[ \t]*:END:[ \t]*$" limit t)))
;; Incomplete drawer: parse it as a paragraph.
(org-element-paragraph-parser limit affiliated)
(save-excursion
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el
index 18991b5..dd91551 100644
--- a/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@ -662,6 +662,9 @@ Some other text
(should-not
(org-test-with-temp-text ":TEST:"
(org-element-map (org-element-parse-buffer) 'drawer 'identity nil t)))
+ (should-not
+ (org-test-with-temp-text ":END:"
+ (org-element-map (org-element-parse-buffer) 'drawer 'identity nil t)))
;; Handle non-empty blank line at the end of buffer.
(should
(org-test-with-temp-text ":TEST:\nC\n:END:\n "
