4 years agoorg.texi (History and Acknowledgments): Mention that Jambunathan rewrote the HTML... release_8.0-pre
Bastien Guerry [Fri, 8 Mar 2013 06:45:30 +0000 (07:45 +0100)]
org.texi (History and Acknowledgments): Mention that Jambunathan rewrote the HTML exporter

* org.texi (History and Acknowledgments): Mention that Jambunathan
rewrote the HTML exporter.

4 years agoMerge branch 'master' of
Bastien Guerry [Thu, 7 Mar 2013 15:31:40 +0000 (16:31 +0100)]
Merge branch 'master' of

4 years agoox-md.el (org-md-export-as-markdown): Tiny docstring fix
Bastien Guerry [Thu, 7 Mar 2013 15:31:24 +0000 (16:31 +0100)]
ox-md.el (org-md-export-as-markdown): Tiny docstring fix

* ox-md.el (org-md-export-as-markdown): Tiny docstring fix.

4 years agoox-md.el: Fix a library keyword in the comment section
Bastien Guerry [Thu, 7 Mar 2013 13:44:58 +0000 (14:44 +0100)]
ox-md.el: Fix a library keyword in the comment section

* ox-md.el: Fix a library keyword in the comment section.

4 years agoox-icalendar: Fix error when `org-icalendar-store-UID' is non-nil
Nicolas Goaziou [Thu, 7 Mar 2013 12:53:50 +0000 (13:53 +0100)]
ox-icalendar: Fix error when `org-icalendar-store-UID' is non-nil

* lisp/ox-icalendar.el (org-icalendar-create-uid): Fix error when
  `org-icalendar-store-UID' is non-nil.

4 years agoMake `org-toggle-item' and `org-toggle-heading' behave more alike
Bastien Guerry [Thu, 7 Mar 2013 11:06:46 +0000 (12:06 +0100)]
Make `org-toggle-item' and `org-toggle-heading' behave more alike

* org.el (org-toggle-item): Convert all normal lines as items when
there is a region, and only convert the first line when called
with a universal prefix argument.  This is consistent with the
behavior of `org-toggle-heading'.
(org-toggle-heading): When the region contains only normal lines,
a universal prefix arg will only convert the first line.  This is
more consistent with `org-toggle-item'.

4 years agoorg.el (orgstruct-setup): Add `org-ctrl-c-minus' and `org-ctrl-c-star'
Bastien Guerry [Thu, 7 Mar 2013 10:26:02 +0000 (11:26 +0100)]
org.el (orgstruct-setup): Add `org-ctrl-c-minus' and `org-ctrl-c-star'

* org.el (orgstruct-setup): Add `org-ctrl-c-minus' and

4 years agoox-latex: Introduce LATEX_HEADER_EXTRA keyword
Nicolas Goaziou [Thu, 7 Mar 2013 07:59:23 +0000 (08:59 +0100)]
ox-latex: Introduce LATEX_HEADER_EXTRA keyword

* lisp/ox-latex.el (latex): Introduce new buffer keyword.
(org-latex-template): Use new keyword.
* lisp/ox-beamer.el (org-beamer-template): Use new keyword.
* lisp/org.el (org-create-formula--latex-header): Use new keyword.
* contrib/lisp/ox-koma-letter.el (org-koma-letter-template): Use new

Previewing of LaTeX snippets takes account of LATEX_HEADER keywords.
LATEX_HEADER_EXTRA keyword allows to specify some header lines that
will not be used for building snippets.

4 years agocontrib/lisp/: Fix some local variables settings
Bastien Guerry [Wed, 6 Mar 2013 22:46:52 +0000 (23:46 +0100)]
contrib/lisp/: Fix some local variables settings

4 years agoMerge branch 'master' of
Bastien Guerry [Wed, 6 Mar 2013 22:41:36 +0000 (23:41 +0100)]
Merge branch 'master' of

4 years agoorg.texi (History and Acknowledgments): Remove Jambunathan from my own acknowledgments
Bastien Guerry [Wed, 6 Mar 2013 22:41:21 +0000 (23:41 +0100)]
org.texi (History and Acknowledgments): Remove Jambunathan from my own acknowledgments

* org.texi (History and Acknowledgments): Remove Jambunathan from
my own acknowledgments.

4 years agofix test failure introduced by moving in 321f806faf
Achim Gratz [Wed, 6 Mar 2013 20:27:13 +0000 (21:27 +0100)]
fix test failure introduced by moving in 321f806faf

* testing/lisp/test-ob-lob.el: The file has been
  moved from contrib/babel to doc, change the code to track that move.

4 years agoMove contrib/babel/langs/* into contrib/lisp/*
Bastien Guerry [Wed, 6 Mar 2013 16:43:33 +0000 (17:43 +0100)]
Move contrib/babel/langs/* into contrib/lisp/*

Also move into doc/ and update the README.

4 years agocontrib/babel/langs/: Fix copyright sections in some files
Bastien Guerry [Wed, 6 Mar 2013 16:36:47 +0000 (17:36 +0100)]
contrib/babel/langs/: Fix copyright sections in some files

4 years agoorg.el: Update `customize-package-emacs-version-alist' and fix :version/:package...
Bastien Guerry [Wed, 6 Mar 2013 16:31:28 +0000 (17:31 +0100)]
org.el: Update `customize-package-emacs-version-alist' and fix :version/:package-version keywords

* org.el (customize-package-emacs-version-alist): Update

* ox-texinfo.el (org-export-texinfo)
(org-texinfo-filename, org-texinfo-classes)
* ox-odt.el (org-odt-format-drawer-function)
* ox-md.el (org-export-md, org-md-headline-style): Fix :version
and :package-version keywords.

4 years agoExport framework: Add :version and :package-version informations to defcustoms
Nicolas Goaziou [Wed, 6 Mar 2013 13:45:12 +0000 (14:45 +0100)]
Export framework: Add :version and :package-version informations to defcustoms

* lisp/ox-beamer.el (org-beamer-column-view-format, org-beamer-theme,
  org-beamer-environments-extra): Add :version and :package-version.
* lisp/ox-html.el (org-html-with-latex, org-html-inline-image-rules):
  Add :version and :package-version.
* lisp/ox-latex.el (org-latex-inline-image-rules,
  org-latex-default-table-environment, org-latex-default-table-mode,
  org-latex-tables-booktabs, org-latex-table-scientific-notation,
  org-latex-known-errors): Add :version and :package-version.
* lisp/ox-md.el (org-md-headline-style): Add :version
  and :package-version.
* lisp/ox-odt.el (org-odt-with-latex): Add :version
  and :package-version.
* lisp/ox.el (org-export-with-drawers, org-export-with-latex,
  org-export-with-inlinetasks, org-export-with-planning,
  org-export-with-smart-quotes, org-export-with-statistics-cookies,
  org-export-allow-bind-keywords, org-export-async-init-file):
  Add :version and :package-version.

4 years agoox-icalendar: Fix code comment
Nicolas Goaziou [Wed, 6 Mar 2013 16:10:26 +0000 (17:10 +0100)]
ox-icalendar: Fix code comment

* lisp/ox-icalendar.el (org-icalendar-export-to-ics): Change back-end
  name from `e-ascii' to `ascii'.

4 years agoox: Fix `org-map-entries' with a nil scope argument usage in hooks
Nicolas Goaziou [Wed, 6 Mar 2013 13:23:49 +0000 (14:23 +0100)]
ox: Fix `org-map-entries' with a nil scope argument usage in hooks

* lisp/ox.el (org-export--generate-copy-script): Call `org-mode' when
  duplicating a buffer.  It will properly set every variable, like
(org-export-async-start): Do not call `org-mode' since this is done
already in the previous function.

4 years agoox-beamer: Remove frame arount toc when generated from a TOC keyword
Nicolas Goaziou [Wed, 6 Mar 2013 12:33:51 +0000 (13:33 +0100)]
ox-beamer: Remove frame arount toc when generated from a TOC keyword

* lisp/ox-beamer.el (org-beamer-keyword): Remove frame arount toc when
  generated from a TOC keyword.

Since TOC keywords are a way to add a table of contents at some
precise location, it is reasonable to think the user will also want to
control the frame surronding it.  Table of contents generated with
toc:t option item still get wrapped within a frame.

4 years agoorg.el (org-time-clocksum-use-effort-durations): Use nil as the default
Bastien Guerry [Wed, 6 Mar 2013 09:37:50 +0000 (10:37 +0100)]
org.el (org-time-clocksum-use-effort-durations): Use nil as the default

* org.el (org-time-clocksum-use-effort-durations): Don't set to t
by default as it will change many clocktables out there.  Let the
user decides whether she wants to turn this on.

4 years agoRevert `org-agenda-dim-blocked-tasks' and `org-agenda-inhibit-startup' to their previ...
Bastien Guerry [Wed, 6 Mar 2013 09:35:19 +0000 (10:35 +0100)]
Revert `org-agenda-dim-blocked-tasks' and `org-agenda-inhibit-startup' to their previous default (t and nil)

* org.el (org-agenda-inhibit-startup): Revert to nil as the default.
* org-agenda.el (org-agenda-dim-blocked-tasks): Revert to t as the

The reason for this reversion is that that users expect the agenda to
DTRT by default, and that it's better not to change the previous default
in general.  Also, users who need to speed up their agenda are probably
long time users with big and numerous agenda files, and it's easier for
them to find these variables than it is for newbies to find out why the
agenda does not DTRT.

If users want to speed up their agenda, they can now read advice here:

4 years agoox-latex: Support tikz images, :width, and :height
Aaron Ecay [Wed, 6 Mar 2013 04:04:42 +0000 (23:04 -0500)]
ox-latex: Support tikz images, :width, and :height

* ox-latex.el:
(org-latex-image-default-option): Change default value to ""
(org-latex-image-default-height): Add variables
(org-latex-inline-image-rules): Make .tikz files as exportable with
(org-latex--inline-image): Support tikz images.  Also support separate
:width and :height parameters for images.

* ob-R.el (org-babel-R-construct-graphics-device-call): Change file
extension of tikz graphics files to .tikz

Tikz graphics should be exported to LaTeX by \include, not as a link.
This commit changes the file extension used for tikz graphics from .tex
to .tikz, and inserts code for including such images.  The :options for
tikz graphics are passed as an optional argument to a tikzpicture

Also provide :width and :height ATTR_LATEX entries for images.  For tikz
graphics, these are implemented with \resizebox; for other image types
they are inserted in the optional arguments to \includegraphics.

4 years ago* lisp/org.el (org-set-font-lock-defaults): include link targets
Aaron Ecay [Wed, 6 Mar 2013 04:07:01 +0000 (23:07 -0500)]
* lisp/org.el (org-set-font-lock-defaults): include link targets

The org-target face is created in org-faces.el, but never used for
font-locking.  This patch fixes that.

4 years agoFix export back-ends status when reloading Org
Nicolas Goaziou [Tue, 5 Mar 2013 23:27:28 +0000 (00:27 +0100)]
Fix export back-ends status when reloading Org

* lisp/org.el (org-export-backends): Do not reset list of loaded
  back-ends to variable's value after a reload.

4 years agoRemove :version and :package-version in contributed packages
Bastien Guerry [Tue, 5 Mar 2013 16:46:41 +0000 (17:46 +0100)]
Remove :version and :package-version in contributed packages

4 years agoox-html.el: More CSS tweaks
Bastien Guerry [Tue, 5 Mar 2013 16:06:01 +0000 (17:06 +0100)]
ox-html.el: More CSS tweaks

* ox-html.el (org-html-style-default): More cosmetic tweaks.
(org-html-head-include-default-style): Minor docstring update.

Thanks to Ken Williams who provided the patch about adding
the name of the source code block.

4 years agoAdd :version and :package-version
Bastien Guerry [Tue, 5 Mar 2013 15:34:16 +0000 (16:34 +0100)]
Add :version and :package-version

* ox.el (org-export-snippet-translation-alist)
(org-export-coding-system, org-export-in-background)
(org-export-async-init-file, org-export-invisible-backends)
* ox-texinfo.el (org-texinfo-filename, org-texinfo-classes)
* ox-man.el (org-man-tables-centered)
(org-man-source-highlight, org-man-source-highlight-langs)
(org-man-pdf-process, org-man-logfiles-extensions):
* ox-html.el (org-html-allow-name-attribute-in-anchors)
(org-html-coding-system, org-html-divs):
* ox-ascii.el (org-ascii-text-width)
(org-ascii-headline-spacing, org-ascii-indented-line-width)
(org-ascii-paragraph-spacing, org-ascii-charset)
(org-ascii-underline, org-ascii-bullets)
* org.el (org-modules, org-export-backends)
(org-highlight-latex-and-related, orgstruct-setup-hook):
* org-attach.el (org-attach-git-annex-cutoff):
* org-archive.el (org-archive-file-header-format):
* org-agenda.el (org-agenda-todo-ignore-time-comparison-use-seconds):
* ob-python.el (org-babel-python-hline-to)
* ob-ditaa.el (org-ditaa-eps-jar-path):
* ob-core.el (org-babel-results-keyword): Add :version and

* ox-ascii.el: Use utf-8-emacs as the file coding system.

4 years agoorg-capture.el: Fix or add docstrings
Bastien Guerry [Tue, 5 Mar 2013 14:35:08 +0000 (15:35 +0100)]
org-capture.el: Fix or add docstrings

* org-capture.el (org-capture-templates, org-capture-string)
(org-capture-import-remember-templates): Fix or add docstring.

4 years agoox-html.el: Update the default CSS
Bastien Guerry [Tue, 5 Mar 2013 14:28:43 +0000 (15:28 +0100)]
ox-html.el: Update the default CSS

* ox-html.el (org-html-style-default): Cosmetic changes.
(org-html-postamble, org-html-preamble)
(org-html-preamble-format): Update docstring.

4 years agoorg-agenda.el: Fix or add docstrings.
Bastien Guerry [Tue, 5 Mar 2013 13:44:01 +0000 (14:44 +0100)]
org-agenda.el: Fix or add docstrings.

* org-agenda.el (org-agenda-format-date-aligned)
(org-agenda-run-series, org-store-agenda-views): Fix or add

4 years agoox-latex.el: Fix some typos in docstrings
Bastien Guerry [Tue, 5 Mar 2013 13:37:47 +0000 (14:37 +0100)]
ox-latex.el: Fix some typos in docstrings

* ox-latex.el:
(org-latex-table-scientific-notation, org-latex-verse-block):
Fix typos in docstrings.

4 years agoox-html.el: Fix or add docstring
Bastien Guerry [Tue, 5 Mar 2013 13:35:51 +0000 (14:35 +0100)]
ox-html.el: Fix or add docstring

* ox-html.el (org-html-text-markup-alist)
(org-html-pretty-output, org-html-link-org-files-as-html)
(org-html-postamble, org-html-preamble)
(org-html-format-inline-image, org-html-splice-attributes)
(org-export-splice-style, org-html-htmlize-region-for-paste)
(org-html-footnote-section, org-html--anchor)
(org-html--todo, org-html--tags, org-html-format-headline)
(org-html-toc, org-html-format-section, org-html-checkbox)
(org-html-format-list-item, org-html-format-latex)
(org-html-table--table.el-table, org-html-final-function): Fix
or add docstring.

4 years agoorg-contacts.el: Fix or add docstrings
Bastien Guerry [Tue, 5 Mar 2013 13:14:54 +0000 (14:14 +0100)]
org-contacts.el: Fix or add docstrings

* org-contacts.el (org-contacts-db)
(org-contacts-icon-as-string, org-contacts-format-name)
(org-contacts-gnus-insinuate): Fix or add docstring.

4 years agoox-latex: Do not overwrite provided numbering options in minted and listings
Nicolas Goaziou [Tue, 5 Mar 2013 11:11:18 +0000 (12:11 +0100)]
ox-latex: Do not overwrite provided numbering options in minted and listings

* lisp/ox-latex.el (org-latex-src-block): Do not overwrite provided
  numbering options in minted and listings.

If "numbers" option (resp. "linenos" option) is provided in
`org-latex-listings-options' (resp. `org-latex-minted-options'),
export will ignore "+n" and "-n" switches from source blocks.

4 years agoorg.el (org-insert-heading): If the current item has a checkbox, insert the new item...
Bastien Guerry [Tue, 5 Mar 2013 10:17:05 +0000 (11:17 +0100)]
org.el (org-insert-heading): If the current item has a checkbox, insert the new item with a checkbox

* org.el (org-insert-heading): If the current item has a
checkbox, insert the new item with a checkbox.

4 years agoorg.el (org-insert-heading): Don't delete spaces in empty headlines
Bastien Guerry [Tue, 5 Mar 2013 07:28:26 +0000 (08:28 +0100)]
org.el (org-insert-heading): Don't delete spaces in empty headlines

* org.el (org-insert-heading): Don't delete spaces in empty

4 years agoFix typo.
Bastien Guerry [Tue, 5 Mar 2013 06:55:10 +0000 (07:55 +0100)]
Fix typo.

4 years agoox-latex: Don't add optional title on unnumbered headlines
Nicolas Goaziou [Mon, 4 Mar 2013 20:18:34 +0000 (21:18 +0100)]
ox-latex: Don't add optional title on unnumbered headlines

* lisp/ox-latex.el (org-latex-headline): Don't add optional title on
  unnumbered headlines.

4 years agoMinor cleanup of backend options.
Rick Frankel [Mon, 4 Mar 2013 20:01:51 +0000 (15:01 -0500)]
Minor cleanup of backend options.

* contrib/lisp/ox-deck.el: Remove unnecessary overrides and
  rationalize name of in-buffer option for include-default-style.
* contrib/lisp/ox-s5.el: Same as above.
(org-s5--build-head): Renamed from org-s5--build-style for consistency
with ox-html.

4 years agocontrib/lisp/org-contacts.el: Fix compiler warnings.
Frank Terbeck [Mon, 4 Mar 2013 19:41:36 +0000 (20:41 +0100)]
contrib/lisp/org-contacts.el: Fix compiler warnings.


4 years agocontrib/babel/langs/ob-julia.el: New file by G. Jay Kerns
Bastien Guerry [Mon, 4 Mar 2013 19:37:20 +0000 (20:37 +0100)]
contrib/babel/langs/ob-julia.el: New file by G. Jay Kerns

I also updated the contrib/README.

Thanks a lot to G. Jay Kerns for this.

Don't miss the thorough documentation here:

4 years agocontrib/babel/langs/: Fix copyright years in some files.
Bastien Guerry [Mon, 4 Mar 2013 19:31:44 +0000 (20:31 +0100)]
contrib/babel/langs/: Fix copyright years in some files.

4 years agoox-odt.el (org-odt-keyword): Fix typo
Bastien Guerry [Mon, 4 Mar 2013 19:31:08 +0000 (20:31 +0100)]
ox-odt.el (org-odt-keyword): Fix typo

* ox-odt.el (org-odt-keyword): Fix typo.

4 years agoCosmetic fix in comment.
Bastien Guerry [Mon, 4 Mar 2013 19:11:15 +0000 (20:11 +0100)]
Cosmetic fix in comment.

4 years agoox-latex.el (org-latex-toc-command): Cosmetic docstring change
Bastien Guerry [Mon, 4 Mar 2013 19:08:39 +0000 (20:08 +0100)]
ox-latex.el (org-latex-toc-command): Cosmetic docstring change

* ox-latex.el (org-latex-toc-command): Cosmetic docstring change.

4 years agoox-html.el: Remove two useless comments.
Bastien Guerry [Mon, 4 Mar 2013 19:08:18 +0000 (20:08 +0100)]
ox-html.el: Remove two useless comments.

4 years agoox-html.el (org-html-encode-plain-text): Fix typo in docstring
Bastien Guerry [Mon, 4 Mar 2013 18:41:34 +0000 (19:41 +0100)]
ox-html.el (org-html-encode-plain-text): Fix typo in docstring

* ox-html.el (org-html-encode-plain-text): Fix typo in docstring.

4 years agoUpdate contrib/README and some comments/messages
Bastien Guerry [Mon, 4 Mar 2013 17:36:34 +0000 (18:36 +0100)]
Update contrib/README and some comments/messages

* org-faces.el (org-column): Update docstring.
* org-colview.el: Update error message.

4 years agocontrib/lisp/: Add org-favtable.el by Marc-Oliver Ihm
Bastien Guerry [Mon, 4 Mar 2013 17:35:02 +0000 (18:35 +0100)]
contrib/lisp/: Add org-favtable.el by Marc-Oliver Ihm

From the comment section:

  Mark and find your favorite things and locations in org easily: Create
  and update a lookup table of your references and links. Often used
  entries bubble to the top and entering some keywords displays only the
  matching entries. That way the right entry one can be picked easily.

  References are essentially small numbers (e.g. "R237" or "-455-"),
  which are created by this package; they are well suited to be used
  outside of org. Links are just normal org-mode links.

4 years agoMove org-mew.el, org-vm.el, org-w3m.el, org-wl.el to contrib/.
Bastien Guerry [Mon, 4 Mar 2013 17:28:26 +0000 (18:28 +0100)]
Move org-mew.el, org-vm.el, org-w3m.el, org-wl.el to contrib/.

* org.el (org-modules): Do not include org-mew.el, org-vm.el,
org-w3m.el, org-wl.el as these files are now part of contrib/.

* org-w3m.el:
* org-vm.el:
* org-w3m.el:
* org-wl.el: Move to contrib/.

The purpose behind this change is to prepare a future split between
org-mode.git and org-contrib.git: org-mode.git will contain all files
that are directly relevant to GNU Emacs, while org-contrib.git will
contain files that are more peripheral and/or from authors who cannot
assign their copyright to the FSF.

This is *not* a way do downgrade those files, it is a way to prepare so that it gets more attention and more contributors,
thanks to the fact that there is no legal barrier to contribute to it.

4 years agoMove org-colview-xemacs.el into contrib/.
Bastien Guerry [Mon, 4 Mar 2013 17:23:05 +0000 (18:23 +0100)]
Move org-colview-xemacs.el into contrib/.

4 years agoMove `org-mks' to org-capture.el and delete org-mks.el.
Bastien Guerry [Mon, 4 Mar 2013 17:21:47 +0000 (18:21 +0100)]
Move `org-mks' to org-capture.el and delete org-mks.el.

* org-capture.el (org-mks): Move from org-mks.el.
* org-mks.el: Delete.

4 years agoUpdate HTML options names in the manual and ox-html.el.
Bastien Guerry [Mon, 4 Mar 2013 16:56:37 +0000 (17:56 +0100)]
Update HTML options names in the manual and ox-html.el.

* org.texi (CSS support): (In-buffer settings): Update HTML options

* ox-html.el (html): Update HTML options names.

4 years agoox-s5.el (s5) and ox-deck.el (deck): Update HTML options names
Bastien Guerry [Mon, 4 Mar 2013 16:55:33 +0000 (17:55 +0100)]
ox-s5.el (s5) and ox-deck.el (deck): Update HTML options names

* ox-s5.el (s5):
* ox-deck.el (deck): Update HTML options names.

4 years agoox-html: Fix "HTML_HEAD" and "HTML_HEAD_EXTRA" keywords
Nicolas Goaziou [Mon, 4 Mar 2013 16:27:18 +0000 (17:27 +0100)]
ox-html: Fix "HTML_HEAD" and "HTML_HEAD_EXTRA" keywords

* lisp/ox-html.el (html): Fix "HTML_HEAD" and "HTML_HEAD_EXTRA"

4 years agoox-html: Allow multiple #+LATEX_HEAD and #+LATEX_HEAD_EXTRA again
Nicolas Goaziou [Mon, 4 Mar 2013 15:23:13 +0000 (16:23 +0100)]
ox-html: Allow multiple #+LATEX_HEAD and #+LATEX_HEAD_EXTRA again

* lisp/ox-html.el (html): Allow multiple #+LATEX_HEAD and

4 years agoSmall refactoring
Nicolas Goaziou [Mon, 4 Mar 2013 14:58:41 +0000 (15:58 +0100)]
Small refactoring

* lisp/org.el (org-fill-paragraph): Small refactoring to

4 years agoSmall fix to `org-fill-paragraph'
Nicolas Goaziou [Mon, 4 Mar 2013 14:56:10 +0000 (15:56 +0100)]
Small fix to `org-fill-paragraph'

* lisp/org.el (org-fill-paragraph): Do not look for table cells in
  a paragraph.

4 years agoorg-element: Simplify restrictions within secondary strings and objects
Nicolas Goaziou [Mon, 4 Mar 2013 07:34:46 +0000 (08:34 +0100)]
org-element: Simplify restrictions within secondary strings and objects

* lisp/org-element.el (org-element-object-restrictions): Simplify
  restrictions within secondary strings and objects.

4 years agoupdate doc to reflect changed variable name
Eric Schulte [Mon, 4 Mar 2013 13:44:31 +0000 (06:44 -0700)]
update doc to reflect changed variable name

* lisp/ob-tangle.el (org-babel-tangle-collect-blocks): Update comment to
  reflect changed variable name.

4 years agofix bug: org-babel-tangle-file can't limit collected source code block by argument.
Ryo TAKAISHI [Mon, 4 Mar 2013 12:52:04 +0000 (21:52 +0900)]
fix bug: org-babel-tangle-file can't limit collected source code block by argument.

* lisp/ob-tangle.el (org-babel-tangle-collect-blocks): Change argument
  name collid org-babel-map-src-blocks's variable 'lang'.


4 years agoorg-list: Use export back-ends to transform radio lists
Nicolas Goaziou [Mon, 4 Mar 2013 09:51:54 +0000 (10:51 +0100)]
org-list: Use export back-ends to transform radio lists

* lisp/org-list.el (org-list-send-list): Do not rely on
(org-list-to-latex, org-list-to-html, org-list-to-texinfo): Use
appropriate export back-end instead of using `org-list-to-generic'.
* testing/lisp/test-org-list.el: Add tests.

4 years agoox-html: Exclude contents div and title from body-only export
Nicolas Goaziou [Mon, 4 Mar 2013 11:15:44 +0000 (12:15 +0100)]
ox-html: Exclude contents div and title from body-only export

* lisp/ox-html.el (org-html-inner-template): Remove contents div and
(org-html-template): Add contents div and title.

4 years agoox-html: Can't activate jsinfo script during a body-only export
Nicolas Goaziou [Mon, 4 Mar 2013 11:16:37 +0000 (12:16 +0100)]
ox-html: Can't activate jsinfo script during a body-only export

* lisp/ox-html.el (org-html-infojs-install-script): Can't activate
  jsinfo script during a body-only export.

4 years agoox: Store export options in :export-options porperty
Nicolas Goaziou [Mon, 4 Mar 2013 11:14:16 +0000 (12:14 +0100)]
ox: Store export options in :export-options porperty

* lisp/ox.el (org-export-as): Store export options in :export-options
  porperty within communication channel.

This patch allows export options activated to be available to export

4 years agoFix bug in `org-schedule' and `org-deadline' introduced in fc8824.
Bastien Guerry [Mon, 4 Mar 2013 11:22:08 +0000 (12:22 +0100)]
Fix bug in `org-schedule' and `org-deadline' introduced in fc8824.

Thanks to Eric Abrahamsen for reporting this.

4 years agoox-latex: Fix bug with enforced item numbering in mixed lists
Nicolas Goaziou [Mon, 4 Mar 2013 07:54:51 +0000 (08:54 +0100)]
ox-latex: Fix bug with enforced item numbering in mixed lists

* lisp/ox-latex.el (org-latex-item): Fix wrong behaviour when
  a counter is set in an ordered list while its parent is not ordered.

This fixes numbering in the following case:

  - Unordered.
    3. [@3] Ordered.

Thanks to Hiroshi Saito for reporting the problem.

4 years agoDon't generate links for empty theme or transition.
Rick Frankel [Mon, 4 Mar 2013 01:50:58 +0000 (20:50 -0500)]
Don't generate links for empty theme or transition.

* ox-deck.el (org-deck--get-packages): Check for non-blank deck-theme
  and deck-transition.

4 years agoorg.el (org-show-context): Don't try to fix ellipsis when showing a subtree in agenda
Bastien Guerry [Mon, 4 Mar 2013 06:38:04 +0000 (07:38 +0100)]
org.el (org-show-context): Don't try to fix ellipsis when showing a subtree in agenda

* org.el (org-show-context): Don't try to fix ellipsis when
showing a subtree in agenda.

Thanks to James Harkins for reporting this.

4 years agoFix typo
Bastien Guerry [Mon, 4 Mar 2013 06:36:54 +0000 (07:36 +0100)]
Fix typo

4 years agoorg-protocol: Pass optional value using query in url to capture from protocol.
Ryo TAKAISHI [Mon, 4 Mar 2013 00:13:34 +0000 (09:13 +0900)]
org-protocol: Pass optional value using query in url to capture from protocol.

* lisp/org-protocol.el: (org-protocol-convert-query-to-plist): New
(org-protocol-do-capture): Use new function.
(org-protocol-data-separator): Change default separator.

When org-protocol's url has query, org-capture get query using
plist-get from store-link.  For example:
Url is "org-protocol:/capture:/URL/TITLE/BODY?key=value"
org-capture can get (:key value) with (plist-get org-store-link-plist :query).


4 years agoComplete fix for 128e14b
Bastien Guerry [Sun, 3 Mar 2013 21:26:09 +0000 (22:26 +0100)]
Complete fix for 128e14b

4 years agoFix commit 128e14b
Bastien Guerry [Sun, 3 Mar 2013 21:21:53 +0000 (22:21 +0100)]
Fix commit 128e14b

4 years agoox-html.el (org-html-code, org-html-verbatim): Transcode value
Jambunathan K [Sun, 3 Mar 2013 08:21:32 +0000 (13:51 +0530)]
ox-html.el (org-html-code, org-html-verbatim): Transcode value

* lisp/ox-html.el (org-html-code, org-html-verbatim):
Transcode value.

4 years agofix a stray "user-error" introduced in bd89d6a02f
Achim Gratz [Sun, 3 Mar 2013 19:29:58 +0000 (20:29 +0100)]
fix a stray "user-error" introduced in bd89d6a02f

* lisp/org-table.el (org-table-eval-formula): The condition-case to
  check for must be "error", not "user-error".

This fixes these test failures:

4 unexpected results:
   FAILED  test-org-table/references/format-specifier-E
   FAILED  test-org-table/references/format-specifier-EL
   FAILED  test-org-table/references/format-specifier-L
   FAILED  test-org-table/references/format-specifier-none

Reported in:

4 years agoox: Fix export of empty src blocks
Nicolas Goaziou [Sun, 3 Mar 2013 18:10:42 +0000 (19:10 +0100)]
ox: Fix export of empty src blocks

* lisp/ox.el (org-export-format-code-default): Handle empty source
  blocks more gracefully.
* lisp/ox-ascii.el (org-ascii-src-block): Handle empty blocks more
* testing/lisp/test-ox.el: Add tests.

4 years agoox-s5.el and ox-deck.el: Use `org-html--build-head'
Bastien Guerry [Sun, 3 Mar 2013 17:59:39 +0000 (18:59 +0100)]
ox-s5.el and ox-deck.el: Use `org-html--build-head'

* ox-s5.el (org-s5-template):
* ox-deck.el (org-deck-template): Use `org-html--build-head'.

See previous commit.

4 years agoox-html.el: Reintroduce #+HTML_HEAD_EXTRA, previously known as HTML_STYLE_EXTRA
Bastien Guerry [Sun, 3 Mar 2013 17:58:40 +0000 (18:58 +0100)]
ox-html.el: Reintroduce #+HTML_HEAD_EXTRA, previously known as HTML_STYLE_EXTRA

* ox-html.el (html): Reintroduce #+HTML_HEAD_EXTRA, previously
(org-html-head): Enhance docstring.
(org-html-head-extra): Reintroduce.  Was `org-html-style-extra'.
(org-html--build-head): Rename from `org-html--build-head'.
Add information from `org-html-head-extra'.
(org-html-template): Use `org-html--build-head'.

Having an option for adding extra stuff is useful when publishing

4 years agoox-html.el (org-html-display-buffer-mode): Delete
Bastien Guerry [Sun, 3 Mar 2013 17:29:00 +0000 (18:29 +0100)]
ox-html.el (org-html-display-buffer-mode): Delete

* ox-html.el (org-html-display-buffer-mode): Delete.
(org-html-export-as-html): Use `set-auto-mode' instead of

Thanks to Jambunathan for suggesting this.

4 years agoorgcontacts.el: Fix `date' being broken in `org-contacts-anniversaries'.
Rüdiger Sonderfeld [Sun, 3 Mar 2013 14:08:12 +0000 (15:08 +0100)]
orgcontacts.el: Fix `date' being broken in `org-contacts-anniversaries'.

* contrib/lisp/org-contacts.el: Add defvar for date.  Similar to org.el.

  (org-contacts-anniversaries): Setting date to nil breaks the
  function.  Bug was introduced in e4cebbe40.

Signed-off-by: Rüdiger Sonderfeld <>
4 years agoorg-agenda.el (org-agenda-write): Overwrite file when called non-interactively
Bastien Guerry [Sun, 3 Mar 2013 16:42:32 +0000 (17:42 +0100)]
org-agenda.el (org-agenda-write): Overwrite file when called non-interactively

* org-agenda.el (org-agenda-write): Overwrite file when called

Thanks to Simon Thum for reporting this.

4 years agoMerge branch 'maint'
Bastien Guerry [Sun, 3 Mar 2013 12:41:20 +0000 (13:41 +0100)]
Merge branch 'maint'

4 years agoorg-mobile.el (org-mobile-edit): Fix bug about inserting headings in invisible region
Bastien Guerry [Sun, 3 Mar 2013 12:41:08 +0000 (13:41 +0100)]
org-mobile.el (org-mobile-edit): Fix bug about inserting headings in invisible region

* org-mobile.el (org-mobile-edit): Workaround a
`org-insert-heading-respect-content' bug which prevents
correct insertion when point is invisible

Thanks to James Harkins for providing this fix.

4 years agoVarious fixes related to `org-insert-heading'.
Bastien Guerry [Sun, 3 Mar 2013 12:38:26 +0000 (13:38 +0100)]
Various fixes related to `org-insert-heading'.

* org.el (org-previous-line-empty-p): New parameter to allow
checking next line.  Add a docstring.
(org-insert-heading): Handle two universal prefix arguments as
advertized in the docstring.  Don't insert new lines when
creating a heading after the first heading in the current
(org-insert-heading-respect-content): New optional argument
arg, passed to `org-insert-heading'.

* org.texi (Structure editing): Update documentation for
(Plain lists, Relative timer): Update index entry.

* org-mobile.el (org-mobile-edit): Use correct parameters for

4 years agoorg.el (org-mode): Remove syntax entries
Bastien Guerry [Sun, 3 Mar 2013 07:02:53 +0000 (08:02 +0100)]
org.el (org-mode): Remove syntax entries

* org.el (org-mode): Remove syntax entries.

4 years agoorg.el (org-mode): New default value for *-of-defun-function
Bastien Guerry [Sun, 3 Mar 2013 06:53:11 +0000 (07:53 +0100)]
org.el (org-mode): New default value for *-of-defun-function

* org.el (org-mode): Use `org-backward-element' and
`org-forward-element' for `beginning-of-defun-function' and
`end-of-defun-function': this allows using C-M-a and C-M-e
before the first headline.

4 years agoox-html.el: Rename a property (complete commit 2752ef1c4b)
Bastien Guerry [Sun, 3 Mar 2013 05:34:35 +0000 (06:34 +0100)]
ox-html.el: Rename a property (complete commit 2752ef1c4b)

Thanks to Sébastien Vauban for reporting this.

4 years agoox-html.el (html): Remove :html-htmlized-css-url :options-alist
Bastien Guerry [Sun, 3 Mar 2013 05:30:43 +0000 (06:30 +0100)]
ox-html.el (html): Remove :html-htmlized-css-url :options-alist

* ox-html.el (html): Remove :html-htmlized-css-url

4 years agotest-ob-perl: add a few perl babel tests
Achim Gratz [Sat, 2 Mar 2013 21:39:42 +0000 (22:39 +0100)]
test-ob-perl: add a few perl babel tests

* testing/lisp/test-ob-perl.el: New file with a few tests of the perl
  babel integration.

4 years agoob-perl: implement results interpretation and improve wrapper
Achim Gratz [Sun, 24 Feb 2013 22:13:07 +0000 (23:13 +0100)]
ob-perl: implement results interpretation and improve wrapper

* lisp/ob-perl.el (org-babel-execute:perl): Pass `result-params´
  through to `org-babel-perl-evaluate´.
* lisp/ob-perl.el (org-babel-variable-assignments:perl): Add "my" to
  variable declaration so that it becomes compatible with "use
* lisp/ob-perl.el (org-babel-varariable-assignments:perl): Use new
  internal formatting function `org-babel-perl--var-to-perl´.
* lisp/ob-perl.el (org-babel-perl--var-to-perl): New internal function, uses Perl
  non-interpolating quoting on the string that defines the variable to
  suppress spurious interpretation of it as Perl syntax.
* lisp/ob-perl.el (org-babel-perl-wrapper-method): Use a block and
  declare all variables as "my", also use Perl quoting throughout.
  Redirect STDOUT to the temporary file so that simply "print" will
  put the results there.  Check the return value and output in table
  form if it is an ARRAY ref, otherwise print it without a final
* lisp/ob-perl.el (org-babel-perl-preface): Content of this variable
  is prepended to body before invocation of perl.
* lisp/ob-perl.el (org-babel-perl-evaluate): Rename input parameter
  body to ibody and let-bind body to concatentation of
  org-babel-perl-preface and ibody.  Implement results interpretation
  so that tables are easier to produce.

Following suggestions by Daniel M. German in

4 years agoob-eval: make org-babel--shell-command-on-region internal and simplify
Achim Gratz [Sun, 24 Feb 2013 16:15:36 +0000 (17:15 +0100)]
ob-eval: make org-babel--shell-command-on-region internal and simplify

* lisp/ob-eval.el (org-babel-eval): Use simplified version of
  `org-babel--shell-command-on-region´, we are the only caller of this
* lisp/ob-eval.el (org-babel--shell-command-on-region): Replace
  `org-babel-shell-command-on-region´ with a much more simplified
  internal version, remove superfluous DOCSTRING and interactive
  clause, strip out all conditionals which were never used.  Prevent
  deletion of temporary input file to aid debugging when the symbol
  `org-babel--debug-input´ is bound and has non-nil value.

4 years agoUpdate `org-export-backends'
Nicolas Goaziou [Sat, 2 Mar 2013 21:48:09 +0000 (22:48 +0100)]
Update `org-export-backends'

* lisp/org.el (org-export-backends): Update variable.  `infojs' was
  merged into ox-html and `freemind' was added.

4 years agoAdd Freemind Mindmap Back-End for Org Export Engine
Jambunathan K [Sat, 2 Mar 2013 05:30:46 +0000 (11:00 +0530)]
Add Freemind Mindmap Back-End for Org Export Engine

* contrib/lisp/ox-freemind.el: New file.

* lisp/ox-html.el (org-html--tags, org-html-format-headline)
(org-html--format-toc-headline, org-html-checkbox)
(org-html-table-cell, org-html-timestamp)
(org-html-verse-block, org-html-special-string-regexps):
Replace named HTML entities with their numeric counterparts.
This keeps Freemind backend happy.

4 years agoox-org: Silence byte-compiler
Nicolas Goaziou [Sat, 2 Mar 2013 18:31:12 +0000 (19:31 +0100)]
ox-org: Silence byte-compiler

4 years agoMerge branch 'master-wip3'
Bastien Guerry [Sat, 2 Mar 2013 17:59:55 +0000 (18:59 +0100)]
Merge branch 'master-wip3'

4 years agoMerge branch 'maint'
Bastien Guerry [Sat, 2 Mar 2013 17:59:47 +0000 (18:59 +0100)]
Merge branch 'maint'


4 years agoox-org.el: Handle :htmlized-source in publishing projects
Bastien Guerry [Sat, 2 Mar 2013 17:46:07 +0000 (18:46 +0100)]
ox-org.el: Handle :htmlized-source in publishing projects

* ox-org.el (org-org-htmlized-css-url): Rename from
`org-html-htmlized-org-css-url' and moved here from
(org-org-publish-to-org): Handle :htmlized-source in
publishing projects.

4 years agoEnsure that new exporter gets tested in batch mode
Achim Gratz [Sat, 2 Mar 2013 17:26:13 +0000 (18:26 +0100)]
Ensure that new exporter gets tested in batch mode

* testing/org-test.el: Require ox so that these tests will be run
  during batch test.

4 years agofix 17131cbf63
Achim Gratz [Sat, 2 Mar 2013 17:10:39 +0000 (18:10 +0100)]
fix 17131cbf63

* lisp/ob-tangle.el (org-babel-tangle): Do not change signature, a nil
  arg is even documented in the manual.
* lisp/org-src.el: Change declaration of `org-babel-tangle´ to "arg"
  for first argument.

4 years agoox-html.el: Use HTML_HEAD instead of HTML_STYLE and fix some variable names
Bastien Guerry [Sat, 2 Mar 2013 17:05:16 +0000 (18:05 +0100)]
ox-html.el: Use HTML_HEAD instead of HTML_STYLE and fix some variable names

* ox-html.el (org-html-style-default): Update docstring.
(org-html-infojs-install-script, org-html--build-style):
Update property names.
(org-html-head-include-default-style, org-html-head):
Respectively rename from `org-html-style-include-scripts',
`org-html-style-include-default' and `org-html-style', now
(org-html-style-extra): Delete.

Thanks to those who pointed at this problem on the mailing list.