[Emacs-diffs] /srv/bzr/emacs/trunk r110652: Fix error in previous merge from Org.

[Chong Yidong]

------------------------------------------------------------
revno: 110652
fixes bug: http://debbugs.gnu.org/12718
author: Jambunathan K <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2012-10-24 23:04:12 +0800
message:
  Fix error in previous merge from Org.
  
  * lisp/org/org-lparse.el: Move some hooks from org-lparse to
  org-do-lparse.
modified:
  lisp/org/ChangeLog
  lisp/org/org-lparse.el

=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2012-10-05 05:57:24 +0000
+++ b/lisp/org/ChangeLog        2012-10-24 15:04:12 +0000
@@ -1,3 +1,8 @@
+2012-10-24  Jambunathan K  <address@hidden>
+
+       * org-lparse.el: Move some hooks from org-lparse to org-do-lparse
+       (Bug#12718).
+
 2012-09-30  Abdó Roig-Maranges  <address@hidden>
 
        * org-html.el (org-export-html-preprocess)

=== modified file 'lisp/org/org-lparse.el'
--- a/lisp/org/org-lparse.el    2012-09-30 15:14:59 +0000
+++ b/lisp/org/org-lparse.el    2012-10-24 15:04:12 +0000
@@ -435,10 +435,6 @@
   (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 @@
                (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 @@
   (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 @@
         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