forked from mirrors/org-mode
Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
This commit is contained in:
commit
647bcc0514
1
Makefile
1
Makefile
|
@ -108,6 +108,7 @@ LISPF = org.el \
|
||||||
org-protocol.el \
|
org-protocol.el \
|
||||||
org-remember.el \
|
org-remember.el \
|
||||||
org-rmail.el \
|
org-rmail.el \
|
||||||
|
org-special-blocks.el \
|
||||||
org-src.el \
|
org-src.el \
|
||||||
org-table.el \
|
org-table.el \
|
||||||
org-taskjuggler.el \
|
org-taskjuggler.el \
|
||||||
|
|
|
@ -45,6 +45,8 @@
|
||||||
by org-special-blocks. These blocks will presumably be
|
by org-special-blocks. These blocks will presumably be
|
||||||
interpreted by other mechanisms.")
|
interpreted by other mechanisms.")
|
||||||
|
|
||||||
|
(defvar htmlp)
|
||||||
|
(defvar latexp)
|
||||||
(defun org-special-blocks-make-special-cookies ()
|
(defun org-special-blocks-make-special-cookies ()
|
||||||
"Adds special cookies when #+begin_foo and #+end_foo tokens are
|
"Adds special cookies when #+begin_foo and #+end_foo tokens are
|
||||||
seen. This is run after a few special cases are taken care of."
|
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
|
(add-hook 'org-export-latex-after-blockquotes-hook
|
||||||
'org-special-blocks-convert-latex-special-cookies)
|
'org-special-blocks-convert-latex-special-cookies)
|
||||||
|
|
||||||
|
(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 `line'.
|
;; Uses the dynamically-bound variable `line'.
|
||||||
|
|
|
@ -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 " mhe: Links to MHE folders/messages" org-mhe)
|
||||||
(const :tag " protocol: Intercept calls from emacsclient" org-protocol)
|
(const :tag " protocol: Intercept calls from emacsclient" org-protocol)
|
||||||
(const :tag " rmail: Links to RMAIL folders/messages" org-rmail)
|
(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 " vm: Links to VM folders/messages" org-vm)
|
||||||
(const :tag " wl: Links to Wanderlust folders/messages" org-wl)
|
(const :tag " wl: Links to Wanderlust folders/messages" org-wl)
|
||||||
(const :tag " w3m: Special cut/paste from w3m to Org-mode." org-w3m)
|
(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 org2rem: Convert org appointments into reminders" org2rem)
|
||||||
(const :tag "C screen: Visit screen sessions through Org-mode links" org-screen)
|
(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 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 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 toc: Table of contents for Org-mode buffer" org-toc)
|
||||||
(const :tag "C track: Keep up with Org-mode development" org-track)
|
(const :tag "C track: Keep up with Org-mode development" org-track)
|
||||||
|
|
Loading…
Reference in a new issue