summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <n.goaziou@gmail.com>2013-01-31 21:16:23 (GMT)
committer Nicolas Goaziou <n.goaziou@gmail.com>2013-01-31 21:16:23 (GMT)
commit787a07421c7d7007dd1b44229e443ccf39e1801a (patch)
tree3e5f43594191770406c2efeb69563051726950cb
parenta2febd210182d9e1a37b0d7fd9ee007a10abc4bc (diff)
parent592dc2ee7e4c80b9b61efb77117c8dc22d6cefd1 (diff)
downloadorg-mode-787a07421c7d7007dd1b44229e443ccf39e1801a.zip
org-mode-787a07421c7d7007dd1b44229e443ccf39e1801a.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-element.el7
-rw-r--r--testing/lisp/test-org-element.el13
2 files changed, 17 insertions, 3 deletions
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 6e38d54..39c8011 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -3116,10 +3116,13 @@ Assume point is at the macro."
(end (point))
(args (let ((args (org-match-string-no-properties 3)) args2)
(when args
- (setq args (org-split-string args ","))
+ ;; Do not use `org-split-string' since empty
+ ;; strings are meaningful here.
+ (setq args (split-string args ","))
(while args
(while (string-match "\\\\\\'" (car args))
- ;; Repair bad splits.
+ ;; Repair bad splits, when comma is protected,
+ ;; and thus not a real separator.
(setcar (cdr args) (concat (substring (car args) 0 -1)
"," (nth 1 args)))
(pop args))
diff --git a/testing/lisp/test-org-element.el b/testing/lisp/test-org-element.el
index 8c6acda..ab5ba60 100644
--- a/testing/lisp/test-org-element.el
+++ b/testing/lisp/test-org-element.el
@@ -1292,7 +1292,18 @@ e^{i\\pi}+1=0
;; 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