Merge branch 'hotfix'

This commit is contained in:
Bastien Guerry 2012-04-06 10:53:24 +02:00
commit e6fdf918a4
1 changed files with 6 additions and 6 deletions

View File

@ -80,17 +80,17 @@ seen. This is run after a few special cases are taken care of."
(add-hook 'org-export-latex-after-blockquotes-hook (add-hook 'org-export-latex-after-blockquotes-hook
'org-special-blocks-convert-latex-special-cookies) 'org-special-blocks-convert-latex-special-cookies)
(defvar org-special-blocks-line) (defvar line)
(defun org-special-blocks-convert-html-special-cookies () (defun org-special-blocks-convert-html-special-cookies ()
"Converts the special cookies into div blocks." "Converts the special cookies into div blocks."
;; Uses the dynamically-bound variable `org-special-blocks-line'. ;; Uses the dynamically-bound variable `line'.
(when (string-match "^ORG-\\(.*\\)-\\(START\\|END\\)$" org-special-blocks-line) (when (string-match "^ORG-\\(.*\\)-\\(START\\|END\\)$" line)
(message "%s" (match-string 1)) (message "%s" (match-string 1))
(when (equal (match-string 2 org-special-blocks-line) "START") (when (equal (match-string 2 line) "START")
(org-close-par-maybe) (org-close-par-maybe)
(insert "\n<div class=\"" (match-string 1 org-special-blocks-line) "\">") (insert "\n<div class=\"" (match-string 1 line) "\">")
(org-open-par)) (org-open-par))
(when (equal (match-string 2 org-special-blocks-line) "END") (when (equal (match-string 2 line) "END")
(org-close-par-maybe) (org-close-par-maybe)
(insert "\n</div>") (insert "\n</div>")
(org-open-par)) (org-open-par))