Merge branch 'maint'

2014-01-17 22:17:39 +01:00 · 2014-01-17 22:17:39 +01:00 · a3fab8d899
parent cd7adb47d8 b0ac2f6ac0
commit a3fab8d899
1 changed files with 2 additions and 2 deletions
--- a/lisp/ox.el
+++ b/lisp/ox.el
@ -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)))