Merge branch 'maint'
This commit is contained in:
commit
4362b93018
10
doc/Makefile
10
doc/Makefile
|
@ -48,10 +48,10 @@ org-version.tex: orgcard.tex
|
||||||
|
|
||||||
install: org orgguide
|
install: org orgguide
|
||||||
if [ ! -d $(DESTDIR)$(infodir) ]; then $(MKDIR) $(DESTDIR)$(infodir); else true; fi ;
|
if [ ! -d $(DESTDIR)$(infodir) ]; then $(MKDIR) $(DESTDIR)$(infodir); else true; fi ;
|
||||||
$(CP) org $(DESTDIR)$(infodir)
|
$(CP) org.info $(DESTDIR)$(infodir)
|
||||||
$(CP) orgguide $(DESTDIR)$(infodir)
|
$(CP) orgguide.info $(DESTDIR)$(infodir)
|
||||||
$(INSTALL_INFO) --infodir=$(DESTDIR)$(infodir) org
|
$(INSTALL_INFO) --infodir=$(DESTDIR)$(infodir) org.info
|
||||||
$(INSTALL_INFO) --infodir=$(DESTDIR)$(infodir) orgguide
|
$(INSTALL_INFO) --infodir=$(DESTDIR)$(infodir) orgguide.info
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(RM) org orgguide *.pdf *.html *_letter.tex org-version.inc \
|
$(RM) org orgguide *.pdf *.html *_letter.tex org-version.inc \
|
||||||
|
@ -68,7 +68,7 @@ clean-install:
|
||||||
.SUFFIXES: .texi .tex .txt _letter.tex
|
.SUFFIXES: .texi .tex .txt _letter.tex
|
||||||
|
|
||||||
%: %.texi org-version.inc
|
%: %.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
|
# the following two lines work around a bug in some versions of texi2dvi
|
||||||
%.pdf: LC_ALL=C
|
%.pdf: LC_ALL=C
|
||||||
|
|
|
@ -737,7 +737,9 @@ Return a list whose CAR is `drawer' and CDR is a plist containing
|
||||||
|
|
||||||
Assume point is at beginning of drawer."
|
Assume point is at beginning of drawer."
|
||||||
(let ((case-fold-search t))
|
(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.
|
;; Incomplete drawer: parse it as a paragraph.
|
||||||
(org-element-paragraph-parser limit affiliated)
|
(org-element-paragraph-parser limit affiliated)
|
||||||
(save-excursion
|
(save-excursion
|
||||||
|
|
|
@ -662,6 +662,9 @@ Some other text
|
||||||
(should-not
|
(should-not
|
||||||
(org-test-with-temp-text ":TEST:"
|
(org-test-with-temp-text ":TEST:"
|
||||||
(org-element-map (org-element-parse-buffer) 'drawer 'identity nil t)))
|
(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.
|
;; Handle non-empty blank line at the end of buffer.
|
||||||
(should
|
(should
|
||||||
(org-test-with-temp-text ":TEST:\nC\n:END:\n "
|
(org-test-with-temp-text ":TEST:\nC\n:END:\n "
|
||||||
|
|
Loading…
Reference in New Issue