summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2018-02-04 00:31:47 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-02-04 00:31:47 +0100
commit85418667a63b1251e6a3cf45df70b65adaf27d5e (patch)
tree2b8448e08c6cd3f17e469648434bb76dc5646f68
parent222a65bdeeb1c23c55533fd105ca516a0827361e (diff)
parent248bc9631b17c6b56a44dc0aedc50bc31607e27f (diff)
downloadorg-mode-85418667a63b1251e6a3cf45df70b65adaf27d5e.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-element.el4
-rw-r--r--testing/lisp/test-ob-exp.el2
-rw-r--r--testing/lisp/test-org-element.el7
3 files changed, 6 insertions, 7 deletions
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 5af2d6e..6bd0091 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -2878,7 +2878,7 @@ Assume point is at the beginning of the babel call."
(save-excursion
(catch :no-object
(when (let ((case-fold-search nil))
- (looking-at "call_\\([^ \t\n[(]+\\)[([]"))
+ (looking-at "\\<call_\\([^ \t\n[(]+\\)[([]"))
(goto-char (match-end 1))
(let* ((begin (match-beginning 0))
(call (match-string-no-properties 1))
@@ -2932,7 +2932,7 @@ Assume point is at the beginning of the inline src block."
(save-excursion
(catch :no-object
(when (let ((case-fold-search nil))
- (looking-at "src_\\([^ \t\n[{]+\\)[{[]"))
+ (looking-at "\\<src_\\([^ \t\n[{]+\\)[{[]"))
(goto-char (match-end 1))
(let ((begin (match-beginning 0))
(language (match-string-no-properties 1))
diff --git a/testing/lisp/test-ob-exp.el b/testing/lisp/test-ob-exp.el
index b0a3ab2..97bc014 100644
--- a/testing/lisp/test-ob-exp.el
+++ b/testing/lisp/test-ob-exp.el
@@ -229,7 +229,7 @@ Here is one at the end of a line. {{{results(=2=)}}}
(org-babel-exp-process-buffer))
(buffer-string))))
(should
- (equal "foosrc_emacs-lisp[]{(+ 1 1)}"
+ (equal "foosrc_emacs-lisp[:exports code]{(+ 1 1)}"
(org-test-with-temp-text
"foosrc_emacs-lisp[:exports code]{(+ 1 1)}"
(let ((org-babel-inline-result-wrap "=%s=")
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el
index eba39d3..3641cd5 100644
--- a/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@ -1223,10 +1223,6 @@ Some other text
(should
(org-test-with-temp-text "src_emacs-lisp{(+ 1 1)}"
(org-element-map (org-element-parse-buffer) 'inline-src-block 'identity)))
- ;; With prefix.
- (should
- (org-test-with-temp-text "foosrc_emacs-lisp[]{(+ 1 1)}"
- (org-element-map (org-element-parse-buffer) 'inline-src-block 'identity)))
;; With switches.
(should
(org-test-with-temp-text "src_emacs-lisp[:foo bar]{(+ 1 1)}"
@@ -1242,6 +1238,9 @@ Some other text
(should-not
(org-test-with-temp-text "src_emacs-lisp[]foo{(+ 1 1)}"
(org-element-map (org-element-parse-buffer) 'inline-src-block 'identity)))
+ (should-not
+ (org-test-with-temp-text "foosrc_emacs-lisp[]{(+ 1 1)}"
+ (org-element-map (org-element-parse-buffer) 'inline-src-block 'identity)))
;; Invalid language name
(should-not
(org-test-with-temp-text "src_emacs-\tlisp{(+ 1 1)}"