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-04-26 14:29:33 +02:00
parent 72febd15f3 75c8be1d8b
commit 74fda6f64d
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org.el
View File

@ -22189,7 +22189,9 @@ a footnote definition, try to fill the first paragraph within."
(table-row (org-table-align) t) (table-row (org-table-align) t)
(table (table
(when (eq (org-element-property :type element) 'org) (when (eq (org-element-property :type element) 'org)
(org-table-align)) (save-excursion
(goto-char (org-element-property :post-affiliated element))
(org-table-align)))
t) t)
(paragraph (paragraph
;; Paragraphs may contain `line-break' type objects. ;; Paragraphs may contain `line-break' type objects.

13
testing/lisp/test-org.el
View File

@ -124,9 +124,16 @@
(ert-deftest test-org/fill-paragraph () (ert-deftest test-org/fill-paragraph ()
"Test `org-fill-paragraph' specifications." "Test `org-fill-paragraph' specifications."
;; At an Org table, align it. ;; At an Org table, align it.
(org-test-with-temp-text "|a|" (should
(org-fill-paragraph) (equal "| a |\n"
(should (equal (buffer-string) "| a |\n"))) (org-test-with-temp-text "|a|"
(org-fill-paragraph)
(buffer-string))))
(should
(equal "#+name: table\n| a |\n"
(org-test-with-temp-text "#+name: table\n| a |"
(org-fill-paragraph)
(buffer-string))))
;; At a paragraph, preserve line breaks. ;; At a paragraph, preserve line breaks.
(org-test-with-temp-text "some \\\\\nlong\ntext" (org-test-with-temp-text "some \\\\\nlong\ntext"
(let ((fill-column 20)) (let ((fill-column 20))