From ea2d1076bba165bb444a80eb932d71a83377accc Mon Sep 17 00:00:00 2001 From: Christopher Schmidt Date: Wed, 13 Feb 2013 10:04:04 +0100 Subject: [PATCH 1/2] org.el: Declare orgstruct-mode * org.el (orgstruct-mode): Declare. --- lisp/org.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lisp/org.el b/lisp/org.el index 589248913..a1e223b9f 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -7399,6 +7399,8 @@ When NO-TODO is non-nil, don't include TODO keywords." (t (looking-at org-heading-regexp) (match-string 2))))) +(defvar orgstruct-mode) ; defined below + (defun org-heading-components () "Return the components of the current heading. This is a list with the following elements: From d6f69f58aa32b104068aee9913200daa30dfcf99 Mon Sep 17 00:00:00 2001 From: Christopher Schmidt Date: Wed, 13 Feb 2013 10:04:37 +0100 Subject: [PATCH 2/2] org.el: Use let instead of progv in org-run-like-in-org-mode * org.el (org-run-like-in-org-mode): Use let instead of progv. --- lisp/org.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index a1e223b9f..b79571783 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -8812,15 +8812,14 @@ call CMD." (org-load-modules-maybe) (unless org-local-vars (setq org-local-vars (org-get-local-variables))) - (let (symbols values) + (let (binds) (dolist (var org-local-vars) (when (or (not (boundp (car var))) (eq (symbol-value (car var)) (default-value (car var)))) - (push (car var) symbols) - (push (cadr var) values))) - (progv symbols values - (call-interactively cmd)))) + (push (list (car var) `(quote ,(cadr var))) binds))) + (eval `(let ,binds + (call-interactively (quote ,cmd)))))) ;;;; Archiving