mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-04 11:40:22 +00:00
Code Issues Releases Activity

Fix error in previous merge from Org.

Browse Source 
* lisp/org/org-lparse.el: Move some hooks from org-lparse to
org-do-lparse.

Fixes: debbugs:12718
This commit is contained in:
Jambunathan K 2012-10-24 23:04:12 +08:00 committed by Chong Yidong
parent a4b6d7c66e
commit c28885aede
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/org/ChangeLog
View File

@ -1,3 +1,8 @@
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)

26
lisp/org/org-lparse.el
View File

@ -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