summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2012-04-06 10:52:34 +0200
committerBastien Guerry <bzg@altern.org>2012-04-06 10:52:34 +0200
commit35a5f069d8a391f18c61b94cf70a58ee1808413a (patch)
tree01a0459b07fbfb8ff05361fb917fb96ecc3bf5e9
parent4e35c21c09f2339f8d95389894ef887aee8539bd (diff)
downloadorg-mode-35a5f069d8a391f18c61b94cf70a58ee1808413a.tar.gz
Revert "Fix global dynamic variables in org-special-blocks.el."
This reverts commit 9054ba39d085dc2910285a194ed2206b36875289. The variable `line' is dynamically scoped in org-html and should not be renamed here.
-rw-r--r--lisp/org-special-blocks.el12
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/org-special-blocks.el b/lisp/org-special-blocks.el
index 5bf8362..43b37c6 100644
--- a/lisp/org-special-blocks.el
+++ b/lisp/org-special-blocks.el
@@ -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
'org-special-blocks-convert-latex-special-cookies)
-(defvar org-special-blocks-line)
+(defvar line)
(defun org-special-blocks-convert-html-special-cookies ()
"Converts the special cookies into div blocks."
- ;; Uses the dynamically-bound variable `org-special-blocks-line'.
- (when (string-match "^ORG-\\(.*\\)-\\(START\\|END\\)$" org-special-blocks-line)
+ ;; Uses the dynamically-bound variable `line'.
+ (when (string-match "^ORG-\\(.*\\)-\\(START\\|END\\)$" line)
(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)
- (insert "\n<div class=\"" (match-string 1 org-special-blocks-line) "\">")
+ (insert "\n<div class=\"" (match-string 1 line) "\">")
(org-open-par))
- (when (equal (match-string 2 org-special-blocks-line) "END")
+ (when (equal (match-string 2 line) "END")
(org-close-par-maybe)
(insert "\n</div>")
(org-open-par))