[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org d7270a2 7/8: Merge branch 'maint'
From: |
Stefan Monnier |
Subject: |
[elpa] externals/org d7270a2 7/8: Merge branch 'maint' |
Date: |
Tue, 22 Dec 2020 16:13:12 -0500 (EST) |
branch: externals/org
commit d7270a2bbb996eb328e6815cc5d26c5925b699a3
Merge: f58c800 97f1d8e
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Commit: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Merge branch 'maint'
---
lisp/org-element.el | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 49a5952..de29c3e 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -3950,26 +3950,37 @@ element it has to parse."
((or (looking-at "[ \t]*|")
;; There is no strict definition of a table.el
;; table. Try to prevent false positive while being
- ;; quick. Hence, we consider a table.el table is at
- ;; least one rule, any number of data lines
- ;; (starting with a vertical bar), and another rule.
+ ;; quick.
(let ((rule-regexp
(rx (zero-or-more (any " \t"))
"+"
(one-or-more (one-or-more "-") "+")
(zero-or-more (any " \t"))
eol))
- (non-table.el-data-line
+ (non-table.el-line
(rx bol
(zero-or-more (any " \t"))
- (or eol (not (any "| \t")))))
+ (or eol (not (any "+| \t")))))
(next (line-beginning-position 2)))
- (and (looking-at rule-regexp)
- (save-excursion
- (end-of-line)
- (re-search-forward non-table.el-data-line limit t)
- (and (> (line-beginning-position) next)
- (org-match-line rule-regexp))))))
+ ;; Start with a full rule.
+ (and
+ (looking-at rule-regexp)
+ (< next limit) ;no room for a table.el table
+ (save-excursion
+ (end-of-line)
+ (cond
+ ;; Must end with a full rule.
+ ((not (re-search-forward non-table.el-line limit 'move))
+ (beginning-of-line)
+ (looking-at rule-regexp))
+ ;; Ignore pseudo-tables with a single
+ ;; rule.
+ ((= next (line-beginning-position))
+ nil)
+ ;; Must end with a full rule.
+ (t
+ (forward-line -1)
+ (looking-at rule-regexp)))))))
(org-element-table-parser limit affiliated))
;; List.
((looking-at (org-item-re))
- [elpa] externals/org updated (6b83c6e -> 9140a71), Stefan Monnier, 2020/12/22
- [elpa] externals/org 713b3bf 2/8: org-contacts.el: Inherit face from org-link, Stefan Monnier, 2020/12/22
- [elpa] externals/org 9140a71 8/8: etc/ORG-NEWS: Add example for new startup option, Stefan Monnier, 2020/12/22
- [elpa] externals/org 1f4ea53 3/8: Document changes of headline fontification introduced in 979e82fc3, Stefan Monnier, 2020/12/22
- [elpa] externals/org bb54a95 4/8: Merge branch 'maint', Stefan Monnier, 2020/12/22
- [elpa] externals/org b6e5ca2 1/8: lint: Remove unnecessary call to `tabulated-list-print', Stefan Monnier, 2020/12/22
- [elpa] externals/org f58c800 6/8: Merge branch 'maint', Stefan Monnier, 2020/12/22
- [elpa] externals/org d7270a2 7/8: Merge branch 'maint',
Stefan Monnier <=
- [elpa] externals/org 0517b73 5/8: Merge branch 'maint', Stefan Monnier, 2020/12/22