diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2021-05-16 10:16:50 +0200 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2021-05-16 10:16:50 +0200 |
| commit | 53b5af21fd26d530b85af147477ba671dc84554a (patch) | |
| tree | 5154cf21d1310c05bee7f04bf537bee1e022e2b7 | |
| parent | fdd70728a8486e56df4aafea1ab0d7c08851236c (diff) | |
| parent | 8846ea71fadd085a9a5bf010ee4dd5b9ca5abe89 (diff) | |
| download | org-mode-53b5af21fd26d530b85af147477ba671dc84554a.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-element.el | 4 | ||||
| -rw-r--r-- | testing/lisp/test-org-element.el | 3 |
2 files changed, 6 insertions, 1 deletions
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 " |