[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org ef66660cf4: Merge branch 'bugfix'
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org ef66660cf4: Merge branch 'bugfix' |
Date: |
Mon, 28 Feb 2022 09:57:45 -0500 (EST) |
branch: externals/org
commit ef66660cf495b2bc6a4eb5b3c21e26d9df8c7577
Merge: e822291aca bafeaf161c
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Commit: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Merge branch 'bugfix'
---
lisp/org-element.el | 24 +++++++++---------------
testing/lisp/test-org-element.el | 9 +++++++++
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 074564e4ef..28339c1b84 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -435,31 +435,25 @@ still has an entry since one of its properties (`:title')
does.")
"Alist between element types and locations of secondary values.")
(defconst org-element--pair-round-table
- (let ((table (make-syntax-table)))
+ (let ((table (make-char-table 'syntax-table '(2))))
(modify-syntax-entry ?\( "()" table)
(modify-syntax-entry ?\) ")(" table)
- (dolist (char '(?\{ ?\} ?\[ ?\] ?\< ?\>) table)
- (modify-syntax-entry char " " table)))
- "Table used internally to pair only round brackets.
-Other brackets are treated as spaces.")
+ table)
+ "Table used internally to pair only round brackets.")
(defconst org-element--pair-square-table
- (let ((table (make-syntax-table)))
+ (let ((table (make-char-table 'syntax-table '(2))))
(modify-syntax-entry ?\[ "(]" table)
(modify-syntax-entry ?\] ")[" table)
- (dolist (char '(?\{ ?\} ?\( ?\) ?\< ?\>) table)
- (modify-syntax-entry char " " table)))
- "Table used internally to pair only square brackets.
-Other brackets are treated as spaces.")
+ table)
+ "Table used internally to pair only square brackets.")
(defconst org-element--pair-curly-table
- (let ((table (make-syntax-table)))
+ (let ((table (make-char-table 'syntax-table '(2))))
(modify-syntax-entry ?\{ "(}" table)
(modify-syntax-entry ?\} "){" table)
- (dolist (char '(?\[ ?\] ?\( ?\) ?\< ?\>) table)
- (modify-syntax-entry char " " table)))
- "Table used internally to pair only curly brackets.
-Other brackets are treated as spaces.")
+ table)
+ "Table used internally to pair only curly brackets.")
(defun org-element--parse-paired-brackets (char)
"Parse paired brackets at point.
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el
index c78ea7c54a..8c6fccb605 100644
--- a/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@ -1161,6 +1161,15 @@ Some other text
(org-test-with-temp-text "Text[fn::def]"
(org-element-map
(org-element-parse-buffer) 'footnote-reference 'identity)))
+ ;; Parse inline references with syntax loaded characters.
+ (should
+ (eq 'footnote-reference
+ (org-test-with-temp-text "Text[fn<point>::(def]"
+ (org-element-type (org-element-context)))))
+ (should
+ (eq 'footnote-reference
+ (org-test-with-temp-text "Text[fn<point>::\"def]"
+ (org-element-type (org-element-context)))))
;; Parse nested footnotes.
(should
(= 2