6 years agosupport for fomus code blocks added to contrib
Eric Schulte [Fri, 8 Jul 2011 14:19:47 +0000 (08:19 -0600)]
support for fomus code blocks added to contrib

  Thanks to Torsten Anders for contributing this functionality

6 years agoRename org-export-convert-* to org-lparse-convert-*
Bastien Guerry [Fri, 8 Jul 2011 10:39:05 +0000 (12:39 +0200)]
Rename org-export-convert-* to org-lparse-convert-*

The org-export-* prefix is confusing here, as these functions
seem to be part of org-exp.el.  Let's name them by the library
they are in (and rely on) for now -- maybe this will change
when we move the ODT exporter to the core.

6 years agocontrib/lisp/org-odt.el: rename org-export-convert-process.
Bastien Guerry [Fri, 8 Jul 2011 10:31:40 +0000 (12:31 +0200)]
contrib/lisp/org-odt.el: rename org-export-convert-process.

Rename org-export-convert-process to org-lparse-convert-process.

Other cosmetic changes.

6 years agocontrib/lisp/org-lparse.el: New defcustom `org-lparse-use-flashy-warning'
Bastien Guerry [Fri, 8 Jul 2011 10:28:35 +0000 (12:28 +0200)]
contrib/lisp/org-lparse.el: New defcustom `org-lparse-use-flashy-warning'

* org-lparse.el (org-lparse-use-flashy-warning): New
(org-lparse-warn): Use it.

6 years agodoc/org.texi: be a bit less formal in ODT's "Additional documentation"
Bastien Guerry [Fri, 8 Jul 2011 10:20:01 +0000 (12:20 +0200)]
doc/org.texi: be a bit less formal in ODT's "Additional documentation"

6 years agoorg-ascii.el: fix `org-export-as-utf8'.
Bastien Guerry [Fri, 8 Jul 2011 09:56:24 +0000 (11:56 +0200)]
org-ascii.el: fix `org-export-as-utf8'.

* org-ascii.el (org-export-as-utf8): fix call to
`org-called-interactively-p': it requires an argument.  Also
fix the docstring.

6 years agoMerge branch 'master' of
Bastien Guerry [Fri, 8 Jul 2011 07:59:28 +0000 (09:59 +0200)]
Merge branch 'master' of

6 years agoorg-mobile.el: Fix org-mobile-push with custom functions
Tassilo Horn [Fri, 8 Jul 2011 06:30:31 +0000 (08:30 +0200)]
org-mobile.el: Fix org-mobile-push with custom functions

6 years agoob-lilypond: add to make file and fix compiler warnings
Eric Schulte [Fri, 8 Jul 2011 01:33:56 +0000 (19:33 -0600)]
ob-lilypond: add to make file and fix compiler warnings

* Makefile (LISPF): Adding ob-lilypond.el.
* lisp/ob-lilypond.el (show-all): Declaring function from outline.el.
  (org-babel-default-header-args:lilypond): Declared.
  (ly-process-basic): Use the appropriate prefix for the temporary
  file, and don't call a function from ob-dot.el.
  (ly-version): Let-bind a free variable.

6 years agoorg.texi: Add Lilypond and Awk as supported languages.
Bastien Guerry [Thu, 7 Jul 2011 20:00:30 +0000 (22:00 +0200)]
org.texi: Add Lilypond and Awk as supported languages.

* install/git/org-mode/doc/org.texi (Languages): Add Lilypond and
Awk as supported languages.

Thanks to Torsten Anders for spotting this.

6 years agocontrib/org-lparse.el and org-odt.el: cosmetic changes.
Bastien Guerry [Thu, 7 Jul 2011 13:18:47 +0000 (15:18 +0200)]
contrib/org-lparse.el and org-odt.el: cosmetic changes.

6 years agoorg.texi: minor fix: use english version for DATE.
Bastien Guerry [Thu, 7 Jul 2011 11:44:56 +0000 (13:44 +0200)]
org.texi: minor fix: use english version for DATE.

Thanks to Giovanni Ridolfi for spotting this!

6 years agoMakefile: Remove dash from git commands
Bastien Guerry [Thu, 7 Jul 2011 11:43:25 +0000 (13:43 +0200)]
Makefile: Remove dash from git commands

I.e. "git tag" instead of "git-tag".

6 years agoMakefile: minor fix to the git command in make testrelease release_7.6
Bastien Guerry [Thu, 7 Jul 2011 06:53:40 +0000 (08:53 +0200)]
Makefile: minor fix to the git command in make testrelease

6 years agoorg-footnote.el: silent compiler warning.
Bastien Guerry [Wed, 6 Jul 2011 20:58:40 +0000 (22:58 +0200)]
org-footnote.el: silent compiler warning.

Declare  `org-bracket-link-regexp'.

Thanks to Achim Gratz for catching this.

6 years agoBump to version 7.6
Bastien Guerry [Wed, 6 Jul 2011 19:06:03 +0000 (21:06 +0200)]
Bump to version 7.6

6 years agoBump to version 7.6
Bastien Guerry [Wed, 6 Jul 2011 19:05:28 +0000 (21:05 +0200)]
Bump to version 7.6

6 years agoBump to version 7.6.
Bastien Guerry [Wed, 6 Jul 2011 19:05:11 +0000 (21:05 +0200)]
Bump to version 7.6.

6 years agoRevert "Silence byte-compiler with a new alias: filter-buffer-substring-functions."
Bastien Guerry [Wed, 6 Jul 2011 18:56:39 +0000 (20:56 +0200)]
Revert "Silence byte-compiler with a new alias: filter-buffer-substring-functions."

This reverts commit 5a2eec320712ee52d0e7b821c11efac3d6eaa96b.

The replacement of `buffer-substring-filters' by
`filter-buffer-substring-functions' requires some rewriting
of functions like `org-indent-remove-properties-from-string'.

6 years agoorg-indent.el: tiny docstring fix.
Bastien Guerry [Wed, 6 Jul 2011 18:49:55 +0000 (20:49 +0200)]
org-indent.el: tiny docstring fix.

6 years agoorg-publish.el: fix bug in `org-publish-cache-file-needs-publishing'.
Bastien Guerry [Wed, 6 Jul 2011 17:21:50 +0000 (19:21 +0200)]
org-publish.el: fix bug in `org-publish-cache-file-needs-publishing'.

* install/git/org-mode/lisp/org-publish.el
(org-publish-cache-file-needs-publishing): only check against .org

6 years agoNew face: org-default.
Bastien Guerry [Wed, 6 Jul 2011 15:25:29 +0000 (17:25 +0200)]
New face: org-default.

* install/git/org-mode/lisp/org.el (org-mode): Use org-default as
the default face in org-mode.

* install/git/org-mode/lisp/org-faces.el (org-default): New face.

M-x customize-face RET org-default RET lets the user define a default
face for org-mode.

6 years agoorg-publish.el: Take #+INCLUDE: directives into account.
Bastien Guerry [Wed, 6 Jul 2011 15:04:07 +0000 (17:04 +0200)]
org-publish.el: Take #+INCLUDE: directives into account.

* install/git/org-mode/lisp/org-publish.el
(org-publish-cache-file-needs-publishing): Takes care of more
recently included files, returning `t' in case the file including
them needs to be republished.

6 years agoob-lilypond: more consistent behavior with other code block languages
Martyn Jago [Wed, 6 Jul 2011 13:17:29 +0000 (07:17 -0600)]
ob-lilypond: more consistent behavior with other code block languages

>    Hi
>    I've added functionality to make ob-lilypond act in a consistent
>    org-babel way by default (think ob-dot).
>    The previous modus operandi is now known as arrange-mode and is
>    selected by setting ly-arrange-mode to t
>    More details including examples are at

6 years agoEXPERIMENTAL/org-export.el: Delete redundant function.
Bastien Guerry [Wed, 6 Jul 2011 10:56:53 +0000 (12:56 +0200)]
EXPERIMENTAL/org-export.el: Delete redundant function.

`org-export-export-preprocess-string' was a dummy copy of
`org-export-preprocess-string', adapted for specific needs
of org-mw-export.  We now use `org-export-preprocess-string'
directly.  This requires a minor change in this latter function:
if :for-backend is not explicitely passed, then the let binding
of `org-export-current-backend' falls back on the previous value
of org-export-current-backend'.

6 years agoRename experimental file org-mediawiki.el to org-mw.el.
Bastien Guerry [Wed, 6 Jul 2011 10:53:19 +0000 (12:53 +0200)]
Rename experimental file org-mediawiki.el to org-mw.el.

This version also introduces many fixes.

6 years agoorg-exp: remove tasks before normalizing footnotes
Nicolas Goaziou [Tue, 5 Jul 2011 18:42:15 +0000 (20:42 +0200)]
org-exp: remove tasks before normalizing footnotes

* lisp/org-exp.el (org-export-preprocess-string): if the last subtree
  is a task, footnotes may be removed along with the subtree. This
  patch ensures footnotes are put at the end of the buffer after the
  subtree has been removed.

6 years agoorg-footnote: distinguish footnotes from links
Nicolas Goaziou [Tue, 5 Jul 2011 11:28:03 +0000 (13:28 +0200)]
org-footnote: distinguish footnotes from links

* lisp/org-footnote.el (org-footnote-at-reference-p): verify that what
  looks like a footnote doesn't belong to a link.
(org-footnote-next-reference-or-definition): check more strictly
footnote definitions.

6 years agoorg.texi: avoid export problem with double dashes.
Bastien Guerry [Tue, 5 Jul 2011 10:28:09 +0000 (12:28 +0200)]
org.texi: avoid export problem with double dashes.

Thanks to Sébastien Delafond for reporting this.
This closes Debian bug #632158 -

6 years agoSilence byte-compiler with a new alias: filter-buffer-substring-functions.
Bastien Guerry [Tue, 5 Jul 2011 10:00:15 +0000 (12:00 +0200)]
Silence byte-compiler with a new alias: filter-buffer-substring-functions.

When `filter-buffer-substring-functions' is not a known variable to
Emacs (for versions < 24.1), we alias it to `buffer-substring-filters'.

6 years agoMakefile: add `make targets' to document possible targets
Bastien Guerry [Tue, 5 Jul 2011 09:27:13 +0000 (11:27 +0200)]
Makefile: add `make targets' to document possible targets

Thanks to Jude DaShiell for this suggestion, and to Nick Dokos for

6 years agoorg.el: fix `org-end-of-meta-data-and-drawers'
Bastien Guerry [Tue, 5 Jul 2011 09:05:20 +0000 (11:05 +0200)]
org.el: fix `org-end-of-meta-data-and-drawers'

Back to the previous version of `org-end-of-meta-data-and-drawers',
with a better fix.

Thanks to Eric Abrahamsen for this.

6 years agoIgnore errors when launching a language's mode when tangling a source block.
Deech [Mon, 4 Jul 2011 19:42:03 +0000 (14:42 -0500)]
Ignore errors when launching a language's mode when tangling a source block.

  The lua-mode for instance was throwing errors that killed the tangling process.

* lisp/ob-tangle.el (org-babel-tangle): Ignore errors thrown by
  language modes.

6 years agotest: adding simple regression test for table formula evaluation
Eric Schulte [Mon, 4 Jul 2011 18:13:41 +0000 (12:13 -0600)]
test: adding simple regression test for table formula evaluation

6 years agotest: small changes to ensure proper setup... passing all tests
Eric Schulte [Mon, 4 Jul 2011 18:04:43 +0000 (12:04 -0600)]
test: small changes to ensure proper setup... passing all tests

6 years agoAdd missing white spaces also in Org guide
Nicolas Goaziou [Mon, 4 Jul 2011 16:42:29 +0000 (18:42 +0200)]
Add missing white spaces also in Org guide

6 years agoAdd some white spaces missing in documentation
Nicolas Goaziou [Mon, 4 Jul 2011 16:36:45 +0000 (18:36 +0200)]
Add some white spaces missing in documentation

6 years agoImprove "Images in LaTeX export" documentation
Suvayu Ali [Mon, 4 Jul 2011 13:03:06 +0000 (15:03 +0200)]
Improve "Images in LaTeX export" documentation

* Mention use of keywords like multicolumn and float
* Remove previous mention of hack with placement option
  as per comments on the mailing list. The hack is
  better suited for Worg.

6 years agoorg-table.el: Er... fix the previous fix about time formulas computation.
Eric S Fraga [Mon, 4 Jul 2011 10:23:25 +0000 (12:23 +0200)]
org-table.el: Er... fix the previous fix about time formulas computation.

The error was introduced by Bastien, not Maciek Starzyk.  Bzg was
trying to fix things manually too hastily :)

6 years agoob-ref.el: declare two functions.
Bastien Guerry [Mon, 4 Jul 2011 09:05:07 +0000 (11:05 +0200)]
ob-ref.el: declare two functions.

Declare `org-id-find-id-in-file' and `org-show-context'.

Thanks to Achim Gratz for spotting this.

6 years agoorg-agenda.el: fix bug in org-diary-class.
Rémi Vanicat [Mon, 4 Jul 2011 09:00:54 +0000 (11:00 +0200)]
org-agenda.el: fix bug in org-diary-class.

calendar-absolute-from-gregorian returns a number of day and
should not be used here.

6 years agoorg-table.el: Fix bug in formula duration computation.
Maciek Starzyk [Mon, 4 Jul 2011 08:51:29 +0000 (10:51 +0200)]
org-table.el: Fix bug in formula duration computation.

6 years agoorg-footnote.el: fix a few compiler warnings.
Bastien Guerry [Sun, 3 Jul 2011 19:32:41 +0000 (21:32 +0200)]
org-footnote.el: fix a few compiler warnings.

Thanks to Achim Gratz for catching them.

6 years agoob-python: inhibit return of the eoe string during session evaluation
Eric Schulte [Sun, 3 Jul 2011 18:12:11 +0000 (12:12 -0600)]
ob-python: inhibit return of the eoe string during session evaluation

* lisp/ob-python.el (org-babel-python-evaluate-session): Inhibit
  return of the eoe string during session evaluation.

6 years agoob-python: enough newlines to ensure a return when ":results output :session"
Eric Schulte [Sun, 3 Jul 2011 18:08:13 +0000 (12:08 -0600)]
ob-python: enough newlines to ensure a return when ":results output :session"

* lisp/ob-python.el (org-babel-python-evaluate-session): Enough
  newlines to ensure a return when ":results output :session".

6 years agoob-python: more robust session evaluation
Eric Schulte [Sun, 3 Jul 2011 15:10:43 +0000 (09:10 -0600)]
ob-python: more robust session evaluation

* lisp/ob-python.el (org-babel-python-evaluate-session): Introduced a
  new local function for sending input with a slight delay to allow
  pythong to re-draw the prompt.  No longer removing newlines inside
  code block bodies (was due to a defective regexp).

6 years agoorg-macs.el: new function `org-format-seconds'.
Bastien Guerry [Sun, 3 Jul 2011 11:23:09 +0000 (13:23 +0200)]
org-macs.el: new function `org-format-seconds'.

* install/git/org-mode/lisp/org-table.el
(org-table-time-seconds-to-string): use `org-format-seconds'
instead of `format-seconds'.

* install/git/org-mode/lisp/org-macs.el (org-format-seconds):
handle case where `format-seconds' does not exist.

6 years agoorg-publish.el: delete trailing whitespaces.
Bastien Guerry [Sun, 3 Jul 2011 11:07:27 +0000 (13:07 +0200)]
org-publish.el: delete trailing whitespaces.

6 years agoProperly handle relative symlinks when publishing
David Maus [Sun, 26 Jun 2011 18:02:42 +0000 (20:02 +0200)]
Properly handle relative symlinks when publishing

* org-publish.el (org-publish-cache-ctime-of-src): Properly handle
relative symlinks.

At Thu, 07 Apr 2011 01:11:00 -0400,
Nick Dokos wrote:
> org-publish-cache-ctime-of-src tries (but does not always succeed) to
> deal with symlinks: file-symlink-p returns the target as a string, but
> if the target is relative to the symlink, that's not going to fly.
> e.g. if c is a symlink like this
>     /a/b/c->../d/f
> then (file-symlink-p "/a/b/c") -> "../d/f"
> but if the current directory is any place other than /a/b, the target
> will not be found, the file attributes are going to be nil and
> the function will blow up.

6 years agoUse function argument instead of dynamically scoped symbol
David Maus [Sat, 2 Jul 2011 14:25:59 +0000 (16:25 +0200)]
Use function argument instead of dynamically scoped symbol

* org-latex.el (org-export-latex-preprocess): Use function argument
instead of dynamically scoped symbol.

Export options are passed to org-export-preprocess-string which passes
them down to backend specific preprocessor. The :footnotes option is

6 years agoUse org-string-match-p for backward compatibility with Emacs22
David Maus [Sat, 2 Jul 2011 14:30:00 +0000 (16:30 +0200)]
Use org-string-match-p for backward compatibility with Emacs22

* org-freemind.el (org-freemind-convert-links-helper)
(org-freemind-convert-text-p, org-freemind-write-mm-buffer)
(org-freemind-get-node-style): Use org-string-match-p for backward
compatibility with Emacs22.

6 years agoAdd missing :group keyword in defcustom
David Maus [Sat, 2 Jul 2011 14:27:43 +0000 (16:27 +0200)]
Add missing :group keyword in defcustom

* org-html.el (org-export-html-protect-char-alist): Add missing :group
keyword in defcustom.

6 years agoCall kill-buffer with argument nil
David Maus [Sat, 2 Jul 2011 14:15:14 +0000 (16:15 +0200)]
Call kill-buffer with argument nil

* ob-haskell.el (org-babel-haskell-export-to-lhs): Call kill-buffer
with argument indiciating to kill current buffer. Emacs 22

GNU Emacs 22.3.2 (i686-pc-linux-gnu) of 2011-05-28 on x60s

C-h f kill-buffer RET

kill-buffer is an interactive built-in function in `C source code'.
It is bound to C-x k.
(kill-buffer buffer)

Kill the buffer buffer.
The argument may be a buffer or the name of a buffer.
With a nil argument, kill the current buffer.

6 years agoMerge branch 'master' of
Bastien Guerry [Sun, 3 Jul 2011 11:00:24 +0000 (13:00 +0200)]
Merge branch 'master' of

6 years agodoc/org.texi: Add a new node for OpenDocumentText exporter
Jambunathan K [Sat, 2 Jul 2011 22:39:22 +0000 (22:39 +0000)]
doc/org.texi: Add a new node for OpenDocumentText exporter


>From 1177aa67678e2c9b0fd1d65cd0d87436fd63a08e Mon Sep 17 00:00:00 2001
From: Jambunathan K <>
Date: Sat, 2 Jul 2011 22:40:18 +0530
Subject: [PATCH 2/2] doc/org.texi: Add a new node for OpenDocumentText exporter

6 years agoorg-lparse/org-odt: Add docstring. Silence byte-compiler
Jambunathan K [Sat, 2 Jul 2011 22:37:29 +0000 (22:37 +0000)]
org-lparse/org-odt: Add docstring. Silence byte-compiler

I am attaching two org-odt patches for inclusion. Both are desirable and
not mandatory.

6 years agoToggle partial-completion-mode only if it is turned on
David Maus [Sat, 2 Jul 2011 14:51:55 +0000 (16:51 +0200)]
Toggle partial-completion-mode only if it is turned on

* org-macs.el (org-without-partial-completion): Toggle
partial-completion-mode only if it is turned on.

6 years agoorg.el: tiny fix to org-add-planning-info.
Bastien Guerry [Sat, 2 Jul 2011 13:23:25 +0000 (15:23 +0200)]
org.el: tiny fix to org-add-planning-info.

6 years agoorg.el: fix issues with timestamps: insert them at the same position.
Bastien Guerry [Sat, 2 Jul 2011 13:13:03 +0000 (15:13 +0200)]
org.el: fix issues with timestamps: insert them at the same position.

* install/git/org-mode/lisp/org.el (org-add-planning-info): fix
issues with timestamps not being inserted at the same position.

6 years agoorg.texi: Add a subsection about computing durations.
Bastien Guerry [Sat, 2 Jul 2011 11:36:13 +0000 (13:36 +0200)]
org.texi: Add a subsection about computing durations.

6 years agoorg-table.el: return correct duration string for Calc formulas.
Bastien Guerry [Sat, 2 Jul 2011 11:34:22 +0000 (13:34 +0200)]
org-table.el: return correct duration string for Calc formulas.

6 years agoorg-table.el: Implement computation of durations with "T" flag
Bastien Guerry [Sat, 2 Jul 2011 11:08:54 +0000 (13:08 +0200)]
org-table.el: Implement computation of durations with "T" flag

* install/git/org-mode/lisp/org-table.el
(org-table-time-seconds-to-string): New functions.
(org-table-eval-formula): Implement the "T" (time) flag for
computing durations.

6 years agoBugfix `org-without-partial-completion' (again).
Bastien Guerry [Sat, 2 Jul 2011 10:15:20 +0000 (12:15 +0200)]
Bugfix `org-without-partial-completion' (again).

Er... We need to call ,@body when partial-completion-mode is nil.

6 years agoFix `org-without-partial-completion' again.
Bastien Guerry [Sat, 2 Jul 2011 09:25:56 +0000 (11:25 +0200)]
Fix `org-without-partial-completion' again.

This uses the macro David Maus suggests.  In particular, it doesn't
use the (let (pc-mode ...)) binding, which, as David states, could
cause leakage if the pc-mode variable is used within ,@body.

6 years agoDon't include org-lparse.el in the list of contributed modules.
Bastien Guerry [Sat, 2 Jul 2011 09:15:57 +0000 (11:15 +0200)]
Don't include org-lparse.el in the list of contributed modules.

This modules is a dependancy of org-odt.el, which is the real
library users want to load.

6 years agoAdd org-lparse and org-odt as contrib modules
Jambunathan K [Sat, 2 Jul 2011 01:31:28 +0000 (01:31 +0000)]
Add org-lparse and org-odt as contrib modules


>From 9b97d19c1184d3cf2cc82831e3d29067cf91f014 Mon Sep 17 00:00:00 2001
From: Jambunathan K <>
Date: Sat, 2 Jul 2011 01:56:01 +0530
Subject: [PATCH] Add org-lparse and org-odt as contrib modules

* lisp/org.el (org-modules): Add org-lparse and org-odt as
contrib modules.
* contrib/README: Ditto

6 years agofix typo
Eric Schulte [Sat, 2 Jul 2011 00:37:30 +0000 (17:37 -0700)]
fix typo

6 years agoorg: fontify #+header lines
Eric Schulte [Fri, 1 Jul 2011 20:12:03 +0000 (13:12 -0700)]
org: fontify #+header lines

* lisp/org.el (org-fontify-meta-lines-and-blocks-1): Include header
  (org-additional-option-like-keywords): Include data as a synonym for

6 years agoob: not including export-variable headers in cache sha1
Eric Schulte [Fri, 1 Jul 2011 19:56:22 +0000 (12:56 -0700)]
ob: not including export-variable headers in cache sha1

* lisp/ob.el (org-babel-sha1-hash): Improving code layout and removing
  export-variable headers in cache sha1.

6 years agoob-lilypond: test suite, all tests passing
Martyn Jago [Fri, 1 Jul 2011 19:22:05 +0000 (12:22 -0700)]
ob-lilypond: test suite, all tests passing

6 years agoob-ref: don't let org-id rescan all IDs when trying to resolve a reference
Eric Schulte [Fri, 1 Jul 2011 19:09:34 +0000 (12:09 -0700)]
ob-ref: don't let org-id rescan all IDs when trying to resolve a reference

* lisp/ob-ref.el (org-babel-ref-goto-headline-id): Don't let org-id
  rescan all IDs when trying to resolve a reference.

6 years agoFix some #+ blocks fontification when there is no lang attribute
Julien Barnier [Fri, 1 Jul 2011 15:28:32 +0000 (17:28 +0200)]
Fix some #+ blocks fontification when there is no lang attribute

* lisp/org.el (org-fontify-meta-lines-and-blocks-1): Fix test for src blocks
lang attribute

When there is no lang attribute to a block (for quote, verse or others), the
lang variable is not nil, but an empty string.

6 years agoMake org-xhtml and org-odt usable
Jambunathan K [Fri, 1 Jul 2011 13:04:05 +0000 (15:04 +0200)]
Make org-xhtml and org-odt usable

* contrib/lisp/org-odt.el (org-odt-data-dir): Update to
reflect new directory layout.

* contrib/lisp/org-xhtml.el
(org-export-xhtml-special-string-regexps): Define it.

6 years agocontrib/lisp/org-xhtml.el: code clean-up.
Bastien Guerry [Fri, 1 Jul 2011 09:25:17 +0000 (11:25 +0200)]
contrib/lisp/org-xhtml.el: code clean-up.

Rename org-export-html-* to org-export-xhtml-*
Add a few FIXME about org-lparse* variables we
need to move to org-lparse.el.

6 years agoAdd Jambunathan's odt exporter in contrib/.
Bastien Guerry [Fri, 1 Jul 2011 09:12:19 +0000 (11:12 +0200)]
Add Jambunathan's odt exporter in contrib/.

This adds these new files:



contrib/lisp/org-xhtml.el is meant to be merged at some point with
lisp/org-html.el, to avoid code redundancies.

The feature as a whole is meant to move to Org's core when things
are tested and stable enough.

Thanks a lot to Jambunathan for this great contribution and for
his patience!

6 years ago* Allow for a different markup for inactive time stamps on latex export
Eric S Fraga [Fri, 1 Jul 2011 02:38:48 +0000 (02:38 +0000)]
* Allow for a different markup for inactive time stamps on latex export

6 years agoSlight modifications to footnotes documentation
Nicolas Goaziou [Fri, 1 Jul 2011 08:45:44 +0000 (10:45 +0200)]
Slight modifications to footnotes documentation

6 years agoMerge branch 'master' of
Bastien Guerry [Fri, 1 Jul 2011 07:38:47 +0000 (09:38 +0200)]
Merge branch 'master' of

6 years agoob-org: expanding variables in Org-mode text
Eric Schulte [Thu, 30 Jun 2011 22:23:35 +0000 (15:23 -0700)]
ob-org: expanding variables in Org-mode text

* lisp/ob-org.el (org-babel-expand-body:org): Implemented this
  function, only action is to expand variables.
  (org-babel-execute:org): Uses the new body-expansion function.

6 years agoUpdated contrib/org-drill.el to latest version (2.3.5)
Paul Sexton [Thu, 30 Jun 2011 21:24:11 +0000 (09:24 +1200)]
Updated contrib/org-drill.el to latest version (2.3.5)

6 years agoAllow white spaces between the counter and the check-box in an item
Nicolas Goaziou [Thu, 30 Jun 2011 20:55:05 +0000 (22:55 +0200)]
Allow white spaces between the counter and the check-box in an item

* lisp/org-list.el (org-list-full-item-re): allow counter and
  check-box to be separated by white spaces.
(org-list-struct-apply-struct): reflect changes made to
* lisp/org-html.el (org-html-export-list-line): recognize spaces
  between counter and check-boxes as valid.
* lisp/org-docbook.el (org-export-docbook-list-line): ditto.

6 years agoorg-list: org-list-insert-item respects its POS argument value
Nicolas Goaziou [Thu, 30 Jun 2011 18:34:45 +0000 (20:34 +0200)]
org-list: org-list-insert-item respects its POS argument value

* lisp/org-list.el (org-list-insert-item): make sure point is moved
  to the specified POS before starting the function.

6 years agomoving ob-lilypond into the core of Org-mode
Eric Schulte [Thu, 30 Jun 2011 18:06:22 +0000 (11:06 -0700)]
moving ob-lilypond into the core of Org-mode

6 years agoFix some glitches in footnotes fontification
Nicolas Goaziou [Thu, 30 Jun 2011 17:29:14 +0000 (19:29 +0200)]
Fix some glitches in footnotes fontification

* lisp/org.el (org-activate-footnote-links): properly fontify inline
(org-set-font-lock-defaults): apply changes to previous function.

6 years agoorg-footnote: find correct reference when two footnotes are side-by-side
Nicolas Goaziou [Thu, 30 Jun 2011 08:59:54 +0000 (10:59 +0200)]
org-footnote: find correct reference when two footnotes are side-by-side

* lisp/org-footnote.el (org-footnote-at-reference-p): first check if
  point is at the beginning of a footnote. Indeed `org-in-regexp'
  first checks backwards and might find an incorrect footnote if they
  are side-by-side.

6 years agoAllow to disable the agenda block separator per block
Michael Brand [Fri, 3 Jun 2011 19:09:46 +0000 (21:09 +0200)]
Allow to disable the agenda block separator per block

* org-agenda.el (org-agenda-compact-blocks): Improve docstring.
(org-agenda-block-separator): Add nil to docstring and customization.
(org-prepare-agenda): Skip agenda block separator additionally if
org-agenda-block-separator is nil.
(org-agenda-overriding-header): Improve docstring.

This change allows to disable the agenda block separator only and also
per block only.  (The variable org-agenda-compact-blocks non-nil
disables agenda block separators together with the line containing the
agenda span name and week number and does this globally for all blocks
and all custom agenda commands.)

6 years agoorg.el: don't escape image links with no description.
Bastien Guerry [Thu, 30 Jun 2011 15:35:23 +0000 (17:35 +0200)]
org.el: don't escape image links with no description.

(org-make-link-string): Don't escape image links when no description
is provided by the user.  Otherwise those images won't be recognized
as images when trying to display inline pictures.

6 years agoorg.el: (org-end-of-meta-data-and-drawers): simplify.
Bastien Guerry [Thu, 30 Jun 2011 16:01:38 +0000 (18:01 +0200)]
org.el: (org-end-of-meta-data-and-drawers): simplify.

6 years agoorg.el: Remove useless `org-without-partial-completion'.
Bastien Guerry [Thu, 30 Jun 2011 15:06:13 +0000 (17:06 +0200)]
org.el: Remove useless `org-without-partial-completion'.

* org.el (org-set-tags): Remove useless `org-without-partial-completion'.

6 years agoRevert "Fix binding problem in org-without-partial-completion."
Bastien Guerry [Thu, 30 Jun 2011 08:42:26 +0000 (10:42 +0200)]
Revert "Fix binding problem in org-without-partial-completion."

This reverts commit ed8627de92d926dd9ff91e1c1977f92f306a8227.

6 years agoorg-footnote: declare function for the compiler
Eric Schulte [Wed, 29 Jun 2011 23:33:39 +0000 (16:33 -0700)]
org-footnote: declare function for the compiler

* lisp/org-footnote.el (org-fill-paragraph): Declare function for the

6 years agoob-ref: declare function for compiler
Eric Schulte [Wed, 29 Jun 2011 23:30:34 +0000 (16:30 -0700)]
ob-ref: declare function for compiler

* lisp/ob-ref.el (org-narrow-to-subtree): Declare unknown function.

6 years agoob: declare variable to appease compiler
Eric Schulte [Wed, 29 Jun 2011 23:29:19 +0000 (16:29 -0700)]
ob: declare variable to appease compiler

* lisp/ob.el (org-babel-inline-lob-one-liner-regexp): Declare variable
  to appease compiler.

6 years agoadding optional argument KIND to all org-called-interactively-p function invocations
Michael Markert [Wed, 29 Jun 2011 22:25:09 +0000 (00:25 +0200)]
adding optional argument KIND to all org-called-interactively-p function invocations

* lisp/ob.el (org-babel-sha1-hash): Adding optional argument KIND to
  all org-called-interactively-p function invocations.
* lisp/org-agenda.el (org-agenda-redo): Adding optional argument KIND to
  all org-called-interactively-p function invocations.
  (org-agenda-show-1): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-agenda-set-tags): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
* lisp/org-ascii.el (org-export-as-latin1): Adding optional argument
  KIND to all org-called-interactively-p function invocations.
  (org-export-as-latin1-to-buffer): Adding optional argument KIND to
  all org-called-interactively-p function invocations.
  (org-export-as-utf8-to-buffer): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-export-region-as-ascii): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
* lisp/org-docbook.el (org-export-region-as-docbook): Adding optional
  argument KIND to all org-called-interactively-p function
* lisp/org-html.el (org-export-region-as-html): Adding optional
  argument KIND to all org-called-interactively-p function
* lisp/org-latex.el (org-export-region-as-latex): Adding optional
  argument KIND to all org-called-interactively-p function
* lisp/org-table.el (org-table-blank-field): Adding optional argument
  KIND to all org-called-interactively-p function invocations.
  (org-table-current-column): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-table-current-dline): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-table-sort-lines): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-table-sum): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-table-rotate-recalc-marks): Adding optional argument KIND to
  all org-called-interactively-p function invocations.
  (org-table-eval-formula): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (orgtbl-send-table): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
* lisp/org.el (org-mode): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-copy-subtree): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-paste-subtree): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-store-link): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-todo): Adding optional argument KIND to all
  org-called-interactively-p function invocations.
  (org-occur): Adding optional argument KIND to all
  org-called-interactively-p function invocations.

6 years agoorg-macs: Determine on macro expand which interactive predicate we need.
Michael Markert [Wed, 29 Jun 2011 22:25:09 +0000 (00:25 +0200)]
org-macs: Determine on macro expand which interactive predicate we need.

Signed-off-by: Michael Markert <>
6 years agoReplace interactive-p with the org-called-interactively-p macro.
Bastien Guerry [Wed, 29 Jun 2011 16:24:08 +0000 (18:24 +0200)]
Replace interactive-p with the org-called-interactively-p macro.

Interactive-p is an obsolete function as of Emacs 23.2.
`org-called-interactively-p' takes care of the current (x)Emacs
version and use either `interactive-p' (for XEmacs and Emacs<23.2)
or `called-interactively-p'.

6 years agoorg-footnote: better action on footnotes with no definition associated
Nicolas Goaziou [Wed, 29 Jun 2011 13:26:22 +0000 (15:26 +0200)]
org-footnote: better action on footnotes with no definition associated

* lisp/org-footnote.el (org-footnote-action): offer to create
  definition when none is found.

6 years agoorg-footnote: strenghten footnotes regexp
Nicolas Goaziou [Tue, 28 Jun 2011 23:14:13 +0000 (01:14 +0200)]
org-footnote: strenghten footnotes regexp

* lisp/org-footnote.el (org-footnote-re): avoid matching inactive
  time-stamps or check-box cookies.
(org-footnote-next-reference-or-definition): adapt to the new regexp.

6 years agoorg-exp: normalize footnotes after removing commented subtrees
Nicolas Goaziou [Tue, 28 Jun 2011 15:07:37 +0000 (17:07 +0200)]
org-exp: normalize footnotes after removing commented subtrees

* lisp/org-exp.el (org-export-preprocess-string): if the last subtree
  is commented, footnotes inserted during normalizing at the end of
  the buffer may get deleted. This patch ensures deletion comes first,
  normalization second.

6 years agoRename org-export-footnotes-markers to org-export-footnotes-seen
Nicolas Goaziou [Sun, 26 Jun 2011 16:51:28 +0000 (18:51 +0200)]
Rename org-export-footnotes-markers to org-export-footnotes-seen

* lisp/org-exp.el (org-export-footnotes-data): change docstring.
(org-export-footnotes-seen): renamed from
* lisp/org-ascii.el (org-export-as-ascii): apply change.
* lisp/org-docbook.el (org-export-as-docbook): apply change.
* lisp/org-footnote.el (org-footnote-normalize): apply change.
* lisp/org-html.el (org-export-as-html): apply change.
* lisp/org-latex.el (org-export-as-latex): apply change.