Revert last change to org-lparse.el

2 files changed, 10 insertions, 21 deletions

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index b234021e8a5..ef40c9316cf 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,8 +1,3 @@
-2012-10-24  Jambunathan K  <kjambunathan@gmail.com>
-
-        * org-lparse.el: Move some hooks from org-lparse to org-do-lparse
-        (Bug#12718).
-
 2012-09-30  Abdó Roig-Maranges  <abdo.roig@gmail.com>
 
         * org-html.el (org-export-html-preprocess)
diff --git a/lisp/org/org-lparse.el b/lisp/org/org-lparse.el
index 8dac907195a..7024912050a 100644
--- a/lisp/org/org-lparse.el
+++ b/lisp/org/org-lparse.el
@@ -435,6 +435,10 @@ 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))
 
@@ -442,7 +446,12 @@ 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)))
-    (org-do-lparse arg hidden ext-plist to-buffer body-only pub-dir)))
+    (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)))
 
 (defcustom org-lparse-use-flashy-warning nil
   "Control flashing of messages logged with `org-lparse-warn'.
@@ -585,16 +594,6 @@ 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
@@ -786,11 +785,6 @@ 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