tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-09-10 09:37:39 +02:00
parent a34a334582 f051d663ab
commit 66a2119ae6
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lisp/ox.el
View File

@ -2628,15 +2628,12 @@ from tree."
;; If headline is archived but tree below has ;; If headline is archived but tree below has
;; to be skipped, remove contents. ;; to be skipped, remove contents.
(org-element-set-contents data) (org-element-set-contents data)
;; Move into secondary string, if any.
(let ((sec-prop
(cdr (assq type
org-element-secondary-value-alist))))
(when sec-prop
(mapc walk-data
(org-element-property sec-prop data))))
;; Move into recursive objects/elements. ;; Move into recursive objects/elements.
(mapc walk-data (org-element-contents data))))))))) (mapc walk-data (org-element-contents data)))
;; Move into secondary string, if any.
(dolist (p (cdr (assq type
org-element-secondary-value-alist)))
(mapc walk-data (org-element-property p data)))))))))
;; If a select tag is active, also ignore the section before the ;; If a select tag is active, also ignore the section before the
;; first headline, if any. ;; first headline, if any.
(when selected (when selected

4
testing/lisp/test-ox.el
View File

@ -591,11 +591,11 @@ Paragraph"
nil nil nil '(:with-properties ("B")))))) nil nil nil '(:with-properties ("B"))))))
;; Statistics cookies. ;; Statistics cookies.
(should (should
(equal "" (equal "* Stats"
(let (org-export-filter-body-functions (let (org-export-filter-body-functions
org-export-filter-final-output-functions) org-export-filter-final-output-functions)
(org-trim (org-trim
(org-test-with-temp-text "[0/0]" (org-test-with-temp-text "* Stats [0/0]"
(org-export-as (org-test-default-backend) (org-export-as (org-test-default-backend)
nil nil nil '(:with-statistics-cookies nil))))))) nil nil nil '(:with-statistics-cookies nil)))))))
;; Tables. ;; Tables.