From: Jambunathan K Date: Wed, 24 Oct 2012 15:04:12 +0000 (+0800) Subject: Fix error in previous merge from Org. X-Git-Tag: emacs-24.2.90~209^2~88 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c28885aede510603835f3b21059ac59e0d6aa095;p=emacs.git Fix error in previous merge from Org. * lisp/org/org-lparse.el: Move some hooks from org-lparse to org-do-lparse. Fixes: debbugs:12718 --- diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index ef40c9316cf..b234021e8a5 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,8 @@ +2012-10-24 Jambunathan K + + * org-lparse.el: Move some hooks from org-lparse to org-do-lparse + (Bug#12718). + 2012-09-30 Abdó Roig-Maranges * org-html.el (org-export-html-preprocess) diff --git a/lisp/org/org-lparse.el b/lisp/org/org-lparse.el index 7024912050a..8dac907195a 100644 --- a/lisp/org/org-lparse.el +++ b/lisp/org/org-lparse.el @@ -435,10 +435,6 @@ PUB-DIR specifies the publishing directory." (let* ((org-lparse-backend (intern native-backend)) (org-lparse-other-backend (and target-backend (intern target-backend)))) - (add-hook 'org-export-preprocess-hook - 'org-lparse-strip-experimental-blocks-maybe) - (add-hook 'org-export-preprocess-after-blockquote-hook - 'org-lparse-preprocess-after-blockquote) (unless (org-lparse-backend-is-native-p native-backend) (error "Don't know how to export natively to backend %s" native-backend)) @@ -446,12 +442,7 @@ PUB-DIR specifies the publishing directory." (org-lparse-reachable-p native-backend target-backend)) (error "Don't know how to export to backend %s %s" target-backend (format "via %s" native-backend))) - (run-hooks 'org-export-first-hook) - (org-do-lparse arg hidden ext-plist to-buffer body-only pub-dir) - (remove-hook 'org-export-preprocess-hook - 'org-lparse-strip-experimental-blocks-maybe) - (remove-hook 'org-export-preprocess-after-blockquote-hook - 'org-lparse-preprocess-after-blockquote))) + (org-do-lparse arg hidden ext-plist to-buffer body-only pub-dir))) (defcustom org-lparse-use-flashy-warning nil "Control flashing of messages logged with `org-lparse-warn'. @@ -594,6 +585,16 @@ version." (setq-default org-deadline-line-regexp org-deadline-line-regexp) (setq-default org-done-keywords org-done-keywords) (setq-default org-maybe-keyword-time-regexp org-maybe-keyword-time-regexp) + + ;; Run first hook. + (run-hooks 'org-export-first-hook) + + ;; Add pre-process hooks. + (add-hook 'org-export-preprocess-hook + 'org-lparse-strip-experimental-blocks-maybe) + (add-hook 'org-export-preprocess-after-blockquote-hook + 'org-lparse-preprocess-after-blockquote) + (let* (hfy-user-sheet-assoc ; let `htmlfontify' know that ; we are interested in ; collecting styles @@ -785,6 +786,11 @@ version." org-lparse-toc href ) + ;; Remove pre-process hooks. + (remove-hook 'org-export-preprocess-hook + 'org-lparse-strip-experimental-blocks-maybe) + (remove-hook 'org-export-preprocess-after-blockquote-hook + 'org-lparse-preprocess-after-blockquote) (let ((inhibit-read-only t)) (org-unmodified