From 8846ea71fadd085a9a5bf010ee4dd5b9ca5abe89 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 16 May 2021 10:14:54 +0200 Subject: [PATCH 1/2] element: Fix drawer parsing * lisp/org-element.el (org-element-drawer-parser): A single ":END:" line should not be recognized as a drawer. * testing/lisp/test-org-element.el (test-org-element/drawer-parser): Add test. Reported-by: Ihor Radchenko --- 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 1e5ca3e6b..0e01a0a8e 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 bc21df33e..93dd3b161 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 " From 9802877fbe442a52b4e63782b84921f46cf5d56b Mon Sep 17 00:00:00 2001 From: Bastien Date: Sun, 16 May 2021 10:35:32 +0200 Subject: [PATCH 2/2] doc/Makefile: Use the .info extension for org.info and orgguide.info * doc/Makefile (install): Use the .info extension when generating info files (org.info and orgguide.info). --- doc/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 96fda1445..fcde02db8 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -48,10 +48,10 @@ org-version.tex: orgcard.tex install: org orgguide if [ ! -d $(DESTDIR)$(infodir) ]; then $(MKDIR) $(DESTDIR)$(infodir); else true; fi ; - $(CP) org $(DESTDIR)$(infodir) - $(CP) orgguide $(DESTDIR)$(infodir) - $(INSTALL_INFO) --infodir=$(DESTDIR)$(infodir) org - $(INSTALL_INFO) --infodir=$(DESTDIR)$(infodir) orgguide + $(CP) org.info $(DESTDIR)$(infodir) + $(CP) orgguide.info $(DESTDIR)$(infodir) + $(INSTALL_INFO) --infodir=$(DESTDIR)$(infodir) org.info + $(INSTALL_INFO) --infodir=$(DESTDIR)$(infodir) orgguide.info clean: $(RM) org orgguide *.pdf *.html *_letter.tex org-version.inc \ @@ -68,7 +68,7 @@ clean-install: .SUFFIXES: .texi .tex .txt _letter.tex %: %.texi org-version.inc - $(MAKEINFO) --no-split $< -o $@ + $(MAKEINFO) --no-split $< -o $@.info # the following two lines work around a bug in some versions of texi2dvi %.pdf: LC_ALL=C