diff options
author | Bastien Guerry <bzg@altern.org> | 2011-01-04 10:04:20 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2011-01-04 10:04:20 +0100 |
commit | 647bcc0514c2e64a3feea4dcd3d85497d99289ba (patch) | |
tree | a99b17849d9f46992befc9b33fa4a1585a2bab4e | |
parent | b981e04c8e364c62140f29266bec5517b04e6732 (diff) | |
parent | 00b59ec00590562e8137c71a6d9b45e18243aa44 (diff) | |
download | org-mode-647bcc0514c2e64a3feea4dcd3d85497d99289ba.tar.gz |
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
-rw-r--r-- | Makefile | 1 | ||||
-rw-r--r-- | lisp/org-special-blocks.el | 3 | ||||
-rw-r--r-- | lisp/org.el | 2 |
3 files changed, 5 insertions, 1 deletions
@@ -108,6 +108,7 @@ LISPF = org.el \ org-protocol.el \ org-remember.el \ org-rmail.el \ + org-special-blocks.el \ org-src.el \ org-table.el \ org-taskjuggler.el \ diff --git a/lisp/org-special-blocks.el b/lisp/org-special-blocks.el index 80e2b89..34479ed 100644 --- a/lisp/org-special-blocks.el +++ b/lisp/org-special-blocks.el @@ -45,6 +45,8 @@ by org-special-blocks. These blocks will presumably be interpreted by other mechanisms.") +(defvar htmlp) +(defvar latexp) (defun org-special-blocks-make-special-cookies () "Adds special cookies when #+begin_foo and #+end_foo tokens are seen. This is run after a few special cases are taken care of." @@ -75,6 +77,7 @@ 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 line) (defun org-special-blocks-convert-html-special-cookies () "Converts the special cookies into div blocks." ;; Uses the dynamically-bound variable `line'. diff --git a/lisp/org.el b/lisp/org.el index 88c66fd..3349dbe 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -295,6 +295,7 @@ to add the symbol `xyz', and the package must have a call to (const :tag " mhe: Links to MHE folders/messages" org-mhe) (const :tag " protocol: Intercept calls from emacsclient" org-protocol) (const :tag " rmail: Links to RMAIL folders/messages" org-rmail) + (const :tag " special-blocks: Turn blocks into LaTeX envs and HTML divs" org-special-blocks) (const :tag " vm: Links to VM folders/messages" org-vm) (const :tag " wl: Links to Wanderlust folders/messages" org-wl) (const :tag " w3m: Special cut/paste from w3m to Org-mode." org-w3m) @@ -329,7 +330,6 @@ to add the symbol `xyz', and the package must have a call to (const :tag "C org2rem: Convert org appointments into reminders" org2rem) (const :tag "C screen: Visit screen sessions through Org-mode links" org-screen) (const :tag "C secretary: Team management with org-mode" org-secretary) - (const :tag "C special-blocks: Turn blocks into LaTeX envs and HTML divs" org-special-blocks) (const :tag "C sqlinsert: Convert Org-mode tables to SQL insertions" orgtbl-sqlinsert) (const :tag "C toc: Table of contents for Org-mode buffer" org-toc) (const :tag "C track: Keep up with Org-mode development" org-track) |