Merge branch 'maint'

diff --cc lisp/org-element.el
Simple merge

diff --cc testing/lisp/test-org-element.el
index 8c6acda,29e1af8..ab5ba60
--- 1/testing/lisp/test-org-element.el
--- 2/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@@ -1292,35 -1207,20 +1292,46 @@@ e^{i\\pi}+1=
    ;; With arguments.
    (should
     (org-test-with-temp-text "{{{macro(arg1,arg2)}}}"
-      (org-element-map (org-element-parse-buffer) 'macro 'identity))))
+      (org-element-map (org-element-parse-buffer) 'macro 'identity)))
+   ;; Properly handle protected commas in arguments...
+   (should
+    (= 2
+       (length
+        (org-test-with-temp-text "{{{macro(arg1\\,arg1,arg2)}}}"
+        (org-element-property :args (org-element-context))))))
+   ;; ... even when last argument ends with a protected comma.
+   (should
+    (equal '("C-,")
+         (org-test-with-temp-text "{{{macro(C-\\,)}}}"
+           (org-element-property :args (org-element-context))))))
  
  
 +;;;; Node Property
 +
 +(ert-deftest test-org-element/node-property ()
 +  "Test `node-property' parser."
 +  ;; Standard test.
 +  (should
 +   (equal '("abc" "value")
 +        (org-test-with-temp-text ":PROPERTIES:\n:abc: value\n:END:"
 +          (progn (forward-line)
 +                 (let ((element (org-element-at-point)))
 +                   (list (org-element-property :key element)
 +                         (org-element-property :value element)))))))
 +  ;; Value should be trimmed.
 +  (should
 +   (equal "value"
 +        (org-test-with-temp-text ":PROPERTIES:\n:abc: value  \n:END:"
 +          (progn (forward-line)
 +                 (let ((element (org-element-at-point)))
 +                   (org-element-property :value element))))))
 +  ;; A node property requires to be wrapped within a property drawer.
 +  (should-not
 +   (eq 'node-property
 +       (org-test-with-temp-text ":abc: value"
 +       (org-element-type (org-element-at-point))))))
 +
 +
  ;;;; Paragraph
  
  (ert-deftest test-org-element/paragraph-parser ()