[elpa] externals/org b049f83: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit b049f839b015c44f5f9cab87907a483c79b8dabc
Merge: bf98b12 4056e11
Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Commit: Nicolas Goaziou <mail@nicolasgoaziou.fr>

    Merge branch 'maint'
---
 lisp/org-element.el              | 4 ++--
 testing/lisp/test-org-element.el | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lisp/org-element.el b/lisp/org-element.el
index 5bac89e..f952cf0 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 value
+                     :value (org-unescape-code-in-string 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) "")
-           body)))
+           (org-trim (org-escape-code-in-string body)))))
 
 ;;;; Italic
 
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el
index 9003b3c..096a65d 100644
--- a/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@ -1288,6 +1288,11 @@ 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"