ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Nicolas Goaziou 2015-01-27 15:35:56 +01:00
parent 96b02fa9a6 a297692b1c
commit 6dc26059cb
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/README
View File

@ -30,7 +30,7 @@ org-eldoc.el --- Eldoc documentation for SRC blocks
org-elisp-symbol.el --- Org links to emacs-lisp symbols org-elisp-symbol.el --- Org links to emacs-lisp symbols
org-eval-light.el --- Evaluate in-buffer code on demand org-eval-light.el --- Evaluate in-buffer code on demand
org-eval.el --- The <lisp> tag, adapted from Muse org-eval.el --- The <lisp> tag, adapted from Muse
org-eww.el --- Store link to url of eww org-eww.el --- Support link/copy/paste from eww to Org-mode
org-expiry.el --- Expiry mechanism for Org entries org-expiry.el --- Expiry mechanism for Org entries
org-export-generic.el --- Export framework for configurable backends org-export-generic.el --- Export framework for configurable backends
org-git-link.el --- Provide org links to specific file version org-git-link.el --- Provide org links to specific file version

2
lisp/ox-html.el
View File

@ -114,8 +114,6 @@
(:html-link-use-abs-url nil "html-link-use-abs-url" org-html-link-use-abs-url) (:html-link-use-abs-url nil "html-link-use-abs-url" org-html-link-use-abs-url)
(:html-link-home "HTML_LINK_HOME" nil org-html-link-home) (:html-link-home "HTML_LINK_HOME" nil org-html-link-home)
(:html-link-up "HTML_LINK_UP" nil org-html-link-up) (:html-link-up "HTML_LINK_UP" nil org-html-link-up)
(:html-head "HTML_HEAD" nil org-html-head newline)
(:html-head-extra "HTML_HEAD_EXTRA" nil org-html-head-extra newline)
(:html-container "HTML_CONTAINER" nil org-html-container-element) (:html-container "HTML_CONTAINER" nil org-html-container-element)
(:html-mathjax "HTML_MATHJAX" nil "" space) (:html-mathjax "HTML_MATHJAX" nil "" space)
(:html-html5-fancy nil "html5-fancy" org-html-html5-fancy) (:html-html5-fancy nil "html5-fancy" org-html-html5-fancy)