From 8cd94ce203f912acccb737c9ee5a07a0130de756 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Wed, 5 Aug 2009 14:43:55 +0200 Subject: [PATCH] Export: Fix bug with #+BIND --- lisp/ChangeLog | 2 ++ lisp/org-exp.el | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4a9ae871b..de57b6a18 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2009-08-05 Carsten Dominik + * org-exp.el (org-default-export-plist): Respect #+BIND. + * org.el (org-paste-subtree): Test the kill ring entry if it is going to be used. (org-copy-subtree): Use `org-forward-same-level'. diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 48a482ce4..b711ee3c0 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -605,10 +605,15 @@ Each element is a list of 3 items: (defun org-default-export-plist () "Return the property list with default settings for the export variables." - (let ((l org-export-plist-vars) rtn e s v) + (let* ((infile (org-infile-export-plist)) + (letbind (plist-get infile :let-bind)) + (l org-export-plist-vars) rtn e s v) (while (setq e (pop l)) (setq s (nth 2 e) - v (if (boundp s) (symbol-value s) nil) + v (cond + ((assq s letbind) (nth 1 (assq s letbind))) + ((boundp s) (symbol-value s)) + (t nil)) rtn (cons (car e) (cons v rtn)))) rtn))