ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2013-07-06 00:41:04 +02:00
parent acb351444e 0aa0fdd971
commit 0bab94dedf
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/org-element.el
View File

@ -1142,10 +1142,11 @@ CONTENTS is the contents of the element."
(off "[ ] ") (off "[ ] ")
(trans "[-] ")) (trans "[-] "))
(and tag (format "%s :: " tag)) (and tag (format "%s :: " tag))
(when contents
(let ((contents (replace-regexp-in-string (let ((contents (replace-regexp-in-string
"\\(^\\)[ \t]*\\S-" ind contents nil nil 1))) "\\(^\\)[ \t]*\\S-" ind contents nil nil 1)))
(if item-starts-with-par-p (org-trim contents) (if item-starts-with-par-p (org-trim contents)
(concat "\n" contents)))))) (concat "\n" contents)))))))
;;;; Plain List ;;;; Plain List

4
testing/lisp/test-org-element.el
View File

@ -2168,7 +2168,9 @@ Outside list"
(equal (org-test-parse-and-interpret "-\n | a | b |") (equal (org-test-parse-and-interpret "-\n | a | b |")
"- \n | a | b |\n")) "- \n | a | b |\n"))
;; Special case: correctly handle "*" bullets. ;; Special case: correctly handle "*" bullets.
(should (org-test-parse-and-interpret " * item")))) (should (org-test-parse-and-interpret " * item"))
;; Special case: correctly handle empty items.
(should (org-test-parse-and-interpret "-"))))
(ert-deftest test-org-element/quote-block-interpreter () (ert-deftest test-org-element/quote-block-interpreter ()
"Test quote block interpreter." "Test quote block interpreter."