From 5d5d1022540b7553963e2c96b4b0460a382c90cf Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 13 Apr 2021 09:47:09 +0200 Subject: [PATCH] Revert "element: Un-escape code in inline source blocks" This reverts commit 4056e11ddcb712e9e65cefdefed407ec197ffedf. We shouldn't code escape inline source blocks, as escaping can be inlined any time, at which point escape character is no longer treated specially. E.g., src_c{a ,* 2} may become src_c{a ,* a} where the comma is no longer an escape character. --- lisp/org-element.el | 4 ++-- testing/lisp/test-org-element.el | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lisp/org-element.el b/lisp/org-element.el index 5eff16f47..0f0e01e8a 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -2980,7 +2980,7 @@ Assume point is at the beginning of the inline source block." (post-blank (skip-chars-forward " \t"))) (list 'inline-src-block (list :language language - :value (org-unescape-code-in-string value) + :value value :parameters parameters :begin begin :end (point) @@ -2994,7 +2994,7 @@ Assume point is at the beginning of the inline source block." (format "src_%s%s{%s}" language (if arguments (format "[%s]" arguments) "") - (org-trim (org-escape-code-in-string body))))) + body))) ;;;; Italic diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el index db2488909..78703467a 100644 --- a/testing/lisp/test-org-element.el +++ b/testing/lisp/test-org-element.el @@ -1288,11 +1288,6 @@ Some other text (eq 'inline-src-block (org-test-with-temp-text "src_emacs-lisp[:foo\nbar]{(+ 1 1)}" (org-element-type (org-element-context))))) - ;; Properly un-escape code. - (should - (equal "(\n* 1 2)" - (org-test-with-temp-text "src_emacs-lisp[:foo bar]{(\n,* 1 2)}" - (org-element-property :value (org-element-context))))) ;; Besides curly brackets, ignore any other bracket type. (should (equal "[foo"