summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-10-24 15:56:11 +0200
committerBastien Guerry <bzg@altern.org>2012-10-24 15:56:11 +0200
commit53f7880d6f4cb3bce518483d78a54b466fcc1945 (patch)
treeec6cae7ee54b1dc463d68b64096c5a46da8b021a
parent66cc45e6700d2de894bd23c9c979a7acb79648b3 (diff)
parentc3390982cb4959f24b7747a70295443e1e36bff8 (diff)
downloadorg-mode-53f7880d6f4cb3bce518483d78a54b466fcc1945.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-lparse.el11
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/org-lparse.el b/lisp/org-lparse.el
index 91b7cc9..c5ced3e 100644
--- a/lisp/org-lparse.el
+++ b/lisp/org-lparse.el
@@ -442,11 +442,12 @@ PUB-DIR specifies the publishing directory."
(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)))
+ (prog1
+ (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'.