diff options
| author | Nicolas Goaziou <n.goaziou@gmail.com> | 2014-01-17 22:17:39 +0100 |
|---|---|---|
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2014-01-17 22:17:39 +0100 |
| commit | a3fab8d8990897be8ec243e13f514745b7a03824 (patch) | |
| tree | c8e5937664cc89d20a51c3542670b711a8c13e4b | |
| parent | cd7adb47d85f6c7d2ddedd33b966d873685b55d3 (diff) | |
| parent | b0ac2f6ac00ece71d01bc160746ccc863cc0e5d9 (diff) | |
| download | org-mode-a3fab8d8990897be8ec243e13f514745b7a03824.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/ox.el | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -3215,8 +3215,8 @@ locally for the subtree through node properties." ;; Populate OPTIONS and KEYWORDS. (dolist (entry (cond ((eq backend 'default) org-export-options-alist) ((org-export-backend-p backend) - (org-export-get-all-options backend)) - (t (org-export-get-all-options + (org-export-backend-options backend)) + (t (org-export-backend-options (org-export-get-backend backend))))) (let ((keyword (nth 1 entry)) (option (nth 2 entry))) |