6 years agoAgenda: New behaviour when shifting scheduled date forward.
Carsten Dominik [Sat, 15 Oct 2011 21:37:59 +0000 (23:37 +0200)]
Agenda: New behaviour when shifting scheduled date forward.

* lisp/org-agenda.el (org-agenda-date-later): Make pushing forward
a past date to jump immedialtely to today.

6 years agoMove some of the new defcustoms to the customization section
Carsten Dominik [Sun, 16 Oct 2011 08:57:21 +0000 (10:57 +0200)]
Move some of the new defcustoms to the customization section

6 years agoPut table style and col sizes under direct user control
Carsten Dominik [Sun, 16 Oct 2011 08:55:28 +0000 (10:55 +0200)]
Put table style and col sizes under direct user control

* contrib/lisp/org-lparse.el
(org-lparse-table-get-colalign-info): Renamed
`org-forced-aligns' to `org-col-cookies'.  Renamed local
variable `forced-aligns' to `col-cookies'.
(org-lparse-format-table-row): With the introduction of
`org-col-cookies' property the internal structure of
`org-lparse-table-colalign-info' has changed.  Do the right
thing while setting up col alignment.  Pass on the colwidth
property as horiz-span arg of `TABLE-CELL' callback.

* contrib/lisp/org-odt.el (org-odt-begin-table): Let the table
style be settable throught #+ATTR_ODT line.  By default tables
are configured to occupy 90% of paper width.  This is too big
for smaller tables.  For aesthetic reasons, a user might
prefer that such tables of shorter width and thus specify a
different style.
(org-odt-end-table, org-odt-format-table-cell): Honor colwidth

* contrib/lisp/org-xhtml.el (org-xhtml-format-table-cell): Fix
signature as mandated by changes in TABLE-CELL callback.

See comments in the earlier patch. See also

6 years agoParse and store both col align and col width spec for later use
Carsten Dominik [Sun, 16 Oct 2011 08:54:20 +0000 (10:54 +0200)]
Parse and store both col align and col width spec for later use

* lisp/org-exp.el (org-store-forced-table-alignment): Parse
the column cookie for both alignment and width specification.
Store the resulting value in `org-col-cookies' property.
Retire the previously used `org-forced-aligns' property for
consistency.  Renamed local variable `aligns' to `cookies'.
* lisp/org-html.el (org-format-org-table-html): Use
`org-col-cookies'.  Renamed local variable forced-aligns to

This is a preparatory patch.  A backend can look at the colwidth
specification and (at it's discretion) use it to control relative
sizes of individual columns in a table.  At this moment, it is unclear
whether the widths used to control the display of table in Org buffer
can be overloaded to also control the formatting of table in a

Refer following discussion with Matt Price:

6 years agoAdd support for LaTeX to MathML conversion
Carsten Dominik [Sun, 16 Oct 2011 08:52:32 +0000 (10:52 +0200)]
Add support for LaTeX to MathML conversion

* lisp/org.el (org-latex-to-mathml-jar-file)
(org-latex-to-mathml-convert-command): New user-customizable
(org-format-latex-mathml-available-p, org-create-math-formula)
(org-format-latex-as-mathml): New functions.
(org-format-latex): Add a new local variable block-type that
notes the nature of the equation - inline or display.
Associate it's value to `org-latex-src-embed-type' property of
dvipng links.  Add mathml as new processing type.

Patch by Jambunathan.

6 years agoRebase: Add tree name to prompt
Sébastien Vauban [Fri, 14 Oct 2011 13:25:14 +0000 (13:25 +0000)]
Rebase: Add tree name to prompt

* lisp/org.el (org-refile): Add tree name to prompt.

6 years agoMake it possible to place table captions below the table
Carsten Dominik [Mon, 10 Oct 2011 19:05:03 +0000 (21:05 +0200)]
Make it possible to place table captions below the table

* lisp/org-latex.el (org-export-latex-tables): Honor
(org-export-latex-table-caption-above): New option.

Patch by Thomas Dye.

6 years agoorg-odt.el: Treat label resolution failures as soft error
Jambunathan K [Mon, 10 Oct 2011 10:55:08 +0000 (16:25 +0530)]
org-odt.el: Treat label resolution failures as soft error

* contrib/lisp/org-odt.el (org-odt-get-label-definition): If a
label cannot be resolved, issue a warning and return nil.
(org-odt-fixup-label-references): Nothing to fixup if a
referenced label is not seen by the odt exporter.

6 years agoorg-odt.el: Abort export if the label referenced is not defined
Jambunathan K [Mon, 10 Oct 2011 08:57:14 +0000 (14:27 +0530)]
org-odt.el: Abort export if the label referenced is not defined

* contrib/lisp/org-odt.el (org-odt-get-label-definition):
Throw an error if the label that is being referenced is not
defined elsewhere.

6 years agoRevert "org-odt.el: Remove dependency on a pending patch"
Jambunathan K [Sun, 9 Oct 2011 16:53:11 +0000 (22:23 +0530)]
Revert "org-odt.el: Remove dependency on a pending patch"

This reverts commit 13b4f6b2e06a76a52ff006e0a9960c4dcac79087.

6 years agonow including language specific header arg values in insertion options
Eric Schulte [Sun, 9 Oct 2011 15:31:32 +0000 (09:31 -0600)]
now including language specific header arg values in insertion options

* lisp/ob.el (org-babel-insert-header-arg): Now including language
  specific header arg values in insertion options.

6 years agoFixed typo in org-babel-insert-header-arg.
Eric Schulte [Sun, 9 Oct 2011 15:11:00 +0000 (09:11 -0600)]
Fixed typo in org-babel-insert-header-arg.

  Thanks to Torsten Wagner for pointing this out and for suggesting
  the original feature.

* lisp/ob.el (org-babel-insert-header-arg): Fixed typo.

6 years agoMerge branch 'master' of
Carsten Dominik [Sun, 9 Oct 2011 11:17:58 +0000 (13:17 +0200)]
Merge branch 'master' of

6 years agoorg-odt help
Jambunathan K [Tue, 4 Oct 2011 23:29:04 +0000 (23:29 +0000)]
org-odt help

> I would like to submit 2 more patches - one to the manual and other to
> org-exp.el.

I am attaching the promised patch to org-exp.el. Can someone review and
commit this change?

Please note that I have withheld the changes to org-odt & co which make
use of this change.

ps: The patch to org.texi will follow soon - maybe in a day or two.

>From 39ab2a263336ba077c7cd6627a3203c55c5bddba Mon Sep 17 00:00:00 2001
From: Jambunathan K <>
Date: Tue, 4 Oct 2011 23:32:35 +0530
Subject: [PATCH] org-exp.el: Enhance `org-export-number-lines' to support odt export

* lisp/org-exp.el (org-export-number-lines): Modified.  Add a
new parameter `preprocess' and use this for backend-agnostic
handling of literal examples.

This parameter is currently exercised only by the odt exporter.  Hint:
See future commits.

6 years agoorg-lparse.el: Remove unecessary link unescape
David Maus [Sun, 11 Sep 2011 14:57:01 +0000 (16:57 +0200)]
org-lparse.el: Remove unecessary link unescape

* contrib/lisp/org-lparse.el (org-lparse-format-org-link): Remove unecessary
link unescape.

6 years agoAllow subscripts and superscripts to start at bol
Nicolas Goaziou [Sun, 9 Oct 2011 07:34:47 +0000 (09:34 +0200)]
Allow subscripts and superscripts to start at bol

* lisp/org.el (org-match-substring-regexp,
  org-match-substring-with-braces-regexp): Allow subscripts and
  superscripts to start at beginning of line.

6 years agobinding new code block header argument helper function to C-c C-v h
Eric Schulte [Sat, 8 Oct 2011 22:35:17 +0000 (16:35 -0600)]
binding new code block header argument helper function to C-c C-v h

6 years agoNew helper function for inserting common code block header arguments
Eric Schulte [Sat, 8 Oct 2011 22:31:50 +0000 (16:31 -0600)]
New helper function for inserting common code block header arguments

* lisp/ob.el (org-babel-common-header-args-w-values): New variable to
  hold common header arguments and their default values.
  (org-babel-header-arg-names): Redefined using the new common header
  arg variable.
  (org-babel-insert-header-arg): New function to help when inserting
  header arguments.

6 years agoRemove unnecessary protection markers
David Maus [Sat, 8 Oct 2011 19:18:57 +0000 (21:18 +0200)]
Remove unnecessary protection markers

* org-html.el (org-html-handle-links): Remove unnecessary protection
markers when publishing link in default format.

Left-over from the mess that was 7.5's HTML export.

6 years agoManual: Better yasnippet config info
Carsten Dominik [Sat, 8 Oct 2011 16:32:16 +0000 (18:32 +0200)]
Manual: Better yasnippet config info

* doc/org.texi (Conflicts): Better yasnippet config info

Patch by Sylvain Rousseau.

6 years agoorg-crypt: when running `org-decrypt-entry', only run `auto-save-mode' check if on...
Pieter Praet [Sun, 28 Aug 2011 18:46:47 +0000 (18:46 +0000)]
org-crypt: when running `org-decrypt-entry', only run `auto-save-mode' check if on an encrypted entry

* lisp/org-crypt.el (org-crypt-check-auto-save): New function, see next change.
* lisp/org-crypt.el (org-decrypt-entry): Break the auto-save-mode check out
  into a separate function, and call it at a later point, to assure it only
  runs when visiting an encrypted entry.

Currently `org-decrypt-entry' is doing the auto-save-mode check whenever
it's run, regardless of context, while this only makes sense when run on
an entry which is actually encrypted (or looks like it, at least).


6 years agoShort timestamp in org-log-note-headings
John J Foerch [Fri, 7 Oct 2011 21:15:36 +0000 (21:15 +0000)]
Short timestamp in org-log-note-headings

Two new format codes support insertion of a short-format time stamp.
%d for an inactive time stamp, and %D for an active one.

* lisp/org.el (org-log-note-headings): Document new %d and %D escapes.
(org-store-log-note): Implement new %d and %D escapes.


6 years agoContinue numbering from any previous numbered snippet with +n, even when previous...
niels giesen [Fri, 16 Sep 2011 20:32:38 +0000 (20:32 +0000)]
Continue numbering from any previous numbered snippet with +n, even when previous numbered snippet does not immediately precede it.

* org-mode/lisp/org-exp.el (org-export-number-lines):

  Check whether number parameter (this is a numbered block!) is
  non-nil as well as whether cont is nil (this numbered block should
  *not* continue numbering where we left off before!) before resetting
  the count to zero.

  From the docs:

    If you use a `+n' switch, the numbering from the previous
    numbered snippet will be continued in the current one.

  With this change I believe the code complies with the docs.

6 years agoMerge branch 'master' of
Carsten Dominik [Sat, 8 Oct 2011 07:02:36 +0000 (09:02 +0200)]
Merge branch 'master' of

6 years agoAdd indirect agenda follow mode
Dave Abrahams [Sat, 24 Sep 2011 19:21:53 +0000 (15:21 -0400)]
Add indirect agenda follow mode

* lisp/org-agenda.el (org-agenda-follow-indirect): New option.
(org-agenda-follow-mode): Call `org-agenda-do-context-action' fro
follow mode.
(org-agenda-do-context-action): Also do indirect follow mode action.

By setting `org-agenda-follow-indirect' to a non-nil value,
`org-agenda-follow-mode' will use an indirect buffer to display only
the current item, rather than the whole agenda file in which it lives

6 years agofix typo in new sbe specification
Eric Schulte [Fri, 7 Oct 2011 18:22:04 +0000 (12:22 -0600)]
fix typo in new sbe specification

* lisp/ob-table.el (sbe): Fix typo in new sbe specification.

6 years agosbe now allows specification of header arguments
Eric Schulte [Fri, 7 Oct 2011 18:16:33 +0000 (12:16 -0600)]
sbe now allows specification of header arguments

* lisp/ob-table.el (sbe): If first variable is a string and not a cons
  cell, then interpret it as a string of header arguments to be passed
  to the code block.

6 years agoob-shen: fix build error
Eric Schulte [Fri, 7 Oct 2011 15:09:44 +0000 (09:09 -0600)]
ob-shen: fix build error

* lisp/ob-shen.el (shen-eval-defun): Declare external function.
  (org-babel-execute:shen): Move requirement of inf-shen into the
  function in which it is used to fix build error.

6 years agoorg-odt.el: Add bottom margin to source or example blocks
Jambunathan K [Fri, 7 Oct 2011 13:32:04 +0000 (19:02 +0530)]
org-odt.el: Add bottom margin to source or example blocks

* contrib/odt/styles/OrgOdtStyles.xml
(OrgFixedWidthBlockLastLine, OrgSrcBlockLastLine): New styles
to be applied to the last line of the source or example

* contrib/lisp/org-odt.el
(org-odt-format-source-code-or-example-colored): Use above

6 years agoorg-odt.el: Remove dependency on a pending patch
Jambunathan K [Fri, 7 Oct 2011 10:59:40 +0000 (16:29 +0530)]
org-odt.el: Remove dependency on a pending patch

Revert this commmit once the patch referenced below is accepted.

6 years agoorg-odt.el: Add support for native numbering of src and example lines
Jambunathan K [Fri, 7 Oct 2011 09:24:17 +0000 (14:54 +0530)]
org-odt.el: Add support for native numbering of src and example lines

* contrib/lisp/org-lparse.el (org-lparse-format-org-link):
Push the responsibility of calling
`org-export-get-coderef-format' to the backends.

* contrib/lisp/org-xhtml.el (org-xhtml-format-org-link): Take
up the above responsibility.

* contrib/lisp/org-odt.el (org-odt-format-link): Handle links whose
descriptions are actually line-numbers.
(org-odt-format-source-line-with-line-number-and-label): New.
Generate line numbers and link targets for lines that are part of
source or example blocks.
(org-odt-format-source-code-or-example-colored): Use
(org-odt-format-source-code-or-example): Pre-process input lines with
`org-export-number-lines'.  Also handle numbering of src lines.
(org-odt-format-org-link): Rework handling of coderef links.  Generate
ODF-specific markup for line-number based coderef links.
(org-xml-encode-plain-text-lines): Removed.  Not used any more.

contrib/odt/styles/OrgOdtStyles.xml (OrgSrcBlockNumberedLine): New
style for automatic numbering of src and example lines.

6 years agoadding initial support for evaluation of shen code blocks
Eric Schulte [Fri, 7 Oct 2011 01:54:22 +0000 (19:54 -0600)]
adding initial support for evaluation of shen code blocks

6 years agoMake org-open-at-point only ask once whether new header should be created
Carsten Dominik [Thu, 6 Oct 2011 08:53:31 +0000 (10:53 +0200)]
Make org-open-at-point only ask once whether new header should be created

* lisp/org.el (org-open-at-point): Make org-open-at-point only ask once
about creating a new headline

When following "thisfile" links org-open-at-point is kind enough to
retry org-link-search again after widening the buffer it can't be
found. However org-link-search also asks the question "No match -
create this as a new heading? (y or n)" when target can't be
found. This means that the question is asked twice when following a
nonexistent link and answering no.

This is fixed by setting org-link-search-inhibit-query in first try,
so only second invocation asks the question.


Patch by Anders Waldenborg

6 years agocontrib/lisp/org-elisp-symbol: Set type if symbol is defuned but not fbound
David Maus [Sun, 25 Sep 2011 21:21:40 +0000 (21:21 +0000)]
contrib/lisp/org-elisp-symbol: Set type if symbol is defuned but not fbound

Another small patch for org-elisp-symbol: Set the symbol type to
"Function or command" if it is defuned but not fbound when
`org-elisp-symbol-store-link' is called.

  -- David

6 years agoBug: org-refile-targets doesn't say whether it's AND or OR [7.7 (release_7.7.351...
Nick Dokos [Thu, 29 Sep 2011 08:59:14 +0000 (08:59 +0000)]
Bug: org-refile-targets doesn't say whether it's AND or OR [7.7 (release_7.7.351.gb8b5)]

Dave Abrahams <> wrote:

> I would change the doc for org-refile-targets to say that the resulting
> list of targets is the union of all the targets matched by each cons
> cell.  I think you could take that pretty much verbatim.

How's this?


>From f853b04fb474493b3b7b8857794c9f120c5f7822 Mon Sep 17 00:00:00 2001
From: Nick Dokos <>
Date: Wed, 28 Sep 2011 23:49:13 -0400
Subject: [PATCH] Amplify the doc for org-refile-targets

* lisp/org.el: (org-refile-targets) Elaborated the documentation of
               the variable as suggested by Dave Abrahams.


6 years agoAllow dashes and underscores in bibtex citation keys
Carsten Dominik [Thu, 6 Oct 2011 08:10:47 +0000 (10:10 +0200)]
Allow dashes and underscores in bibtex citation keys

* contrib/lisp/org-exp-bibtex.el (org-export-bibtex-preprocess): Allow
dashes and underscores in bibtex citation keys.


Patch by Nik Putnam

6 years agoBugfix for alignment of tag next to header name
Carsten Dominik [Thu, 6 Oct 2011 07:44:08 +0000 (09:44 +0200)]
Bugfix for alignment of tag next to header name

* lisp/org.el (org-align-tags-here): Allow tags to be placed right
after heading.
(org-tags-column): Document the meaning of tags column 0.

Patch by Michael Brand.


6 years agoTime range end in agenda view not displayed
niels giesen [Fri, 30 Sep 2011 19:41:35 +0000 (19:41 +0000)]
Time range end in agenda view not displayed

Giovanni Ridolfi <> writes:

> michael holzer <> writes:
>> When I have an entry that contains a time range, for example:
>> * timerange
>>   <2011-09-30 Fri 14:00>--<2011-09-30 Fri 18:00>
>> this shows up in the agenda view as:
>>   uni:        14:00...... timerange
>> while I would expect something like:
>>   uni:        14:00-18:00 timerange
> |the manual says:
> |Time ranges can be specified with two timestamps,
> |like ‘<2005-05-10 Tue 20:30>--<2005-05-10 Tue 22:15>’.
> |
> | 20:30-22:15 Marvin escorts the Hitchhikers to the bridge
> I confirm this bug.
> Org-mode version 7.7 0e9d401519c020af29a7e35da7acfca25e6c3be4
> GNU Emacs 23.3.1 (i386-mingw-nt5.1.2600) of 2011-03-10 on 3249CTO
> Giovanni

Funny enough, I noticed this too last week, so I whipped up this patch.
It inserts the range when start date is the same as the end date. Please
test (it's still young) && include in Org if you so please.

#+begin_src diff
>From dcf81753aa5cab311f2a3a0272e4691e4bc6ea38 Mon Sep 17 00:00:00 2001
From: Niels Giesen <>
Date: Mon, 26 Sep 2011 11:43:55 +0200
Subject: [PATCH] Show timestamp ranges in agenda

* lisp/org-agenda.el (org-agenda-get-blocks): Show timestamp ranges in
  agenda if start day is same as end day

6 years agoMake org-refile interface for jumping to a target work before first heading
Carsten Dominik [Wed, 5 Oct 2011 14:18:18 +0000 (16:18 +0200)]
Make org-refile interface for jumping to a target work before first heading

* lisp/org.el (org-refile-get-location): Ignore errors when
collection heading to be excluded.

6 years agoRevert "Avoid XHTML strict problems by not enclosing special blocks in paragraph...
Carsten Dominik [Tue, 4 Oct 2011 21:31:43 +0000 (23:31 +0200)]
Revert "Avoid XHTML strict problems by not enclosing special blocks in paragraph tags"

This reverts commit 4e3cc81a2e70c2f74f8d62a327e1b2a608f003d9.

6 years agoAvoid XHTML strict problems by not enclosing special blocks in paragraph tags
Carsten Dominik [Tue, 4 Oct 2011 14:22:27 +0000 (16:22 +0200)]
Avoid XHTML strict problems by not enclosing special blocks in paragraph tags

* lisp/org-special-blocks.el (org-special-blocks-convert-html-special-cookies):
Avoid XHTML strict problems by not enclosing special blocks in
paragraph tags.

6 years agoCheck argument is a string before calling string-match
Bernt Hansen [Tue, 20 Sep 2011 04:20:02 +0000 (04:20 +0000)]
Check argument is a string before calling string-match

* lisp/org-html.el (org-export-as-html): Check string-match argument
(org-html-handle-time-stamps): Check string-match argument

Avoid wrong-type-argument errors during exporting.

6 years agoChange default value of `org-agenda-skip-additional-timestamps-same-entry'
Carsten Dominik [Tue, 4 Oct 2011 12:30:32 +0000 (14:30 +0200)]
Change default value of `org-agenda-skip-additional-timestamps-same-entry'

* lisp/org-agenda.el (org-agenda-skip-additional-timestamps-same-entry):
Change default value.

6 years agoImprove error reporting on bad time stamps during agenda construction
Carsten Dominik [Tue, 4 Oct 2011 12:12:11 +0000 (14:12 +0200)]
Improve error reporting on bad time stamps during agenda construction

* lisp/org.el (org-time-string-to-time):
(org-time-string-to-absolute): Add optional arguments BUFFER and POS
for error reporting.
* lisp/org-agenda.el (org-get-all-dates):
(org-agenda-get-blocks): Call time stamp parsing functions with
information on where the timestamp was taken from.

6 years agoFix typo in previous commit
Carsten Dominik [Tue, 4 Oct 2011 08:00:10 +0000 (10:00 +0200)]
Fix typo in previous commit

6 years agoRun `org-cycle-hook' after `show-all' in indirect buffer
Carsten Dominik [Tue, 4 Oct 2011 07:56:12 +0000 (09:56 +0200)]
Run `org-cycle-hook' after `show-all' in indirect buffer

* lisp/org.el (org-tree-to-indirect-buffer): Run `org-cycle-hook' after `show-all'
in indirect buffer.

6 years agoBetter handling of ill-formed lists
Nicolas Goaziou [Thu, 22 Sep 2011 17:04:27 +0000 (19:04 +0200)]
Better handling of ill-formed lists

* lisp/org-list.el (org-list-parents-alist): When no parent is found
  for an item, set it as the closest less indented item above.  If
  none is found, make it a top level item.
(org-list-write-struct): Externalize code.
(org-list-struct-fix-item-end): New function.
(org-list-struct): Remove a now useless fix.
* lisp/org.el (org-ctrl-c-ctrl-c): Use new function.

6 years ago`org-special-ctrl-a/e' effectively behaves specially on items
Nicolas Goaziou [Sat, 1 Oct 2011 18:37:16 +0000 (20:37 +0200)]
`org-special-ctrl-a/e' effectively behaves specially on items

* lisp/org.el (org-end-of-line): When on an item, move point at the
  end of the line, but before any hidden text.  Thus, it's still
  possible to use commands, like C-c C-c, acting at items.  This is
  still disabled if `org-special-ctrl-a/e' ignores C-e.

6 years agoorg-footnote: Small refactoring
Nicolas Goaziou [Sat, 1 Oct 2011 06:57:33 +0000 (08:57 +0200)]
org-footnote: Small refactoring

* lisp/org-footnote.el (org-footnote-renumber-fn:N): Small

6 years agoorg-footnote: Fix an infloop
Nicolas Goaziou [Thu, 29 Sep 2011 20:53:45 +0000 (22:53 +0200)]
org-footnote: Fix an infloop

* lisp/org-footnote.el (org-footnote-renumber-fn:N): Fix an infloop
  introduced by commit 1effad02beb79b2fb26506bd4142cb74bbe3a906.

6 years agoorg-footnote: Remove useless org-re
Nicolas Goaziou [Thu, 29 Sep 2011 20:44:58 +0000 (22:44 +0200)]
org-footnote: Remove useless org-re

* lisp/org-footnote.el (org-footnote-at-definition-p): remove useless

6 years agoorg-footnote: Only renumber real footnotes references or definitions
Nicolas Goaziou [Thu, 29 Sep 2011 20:34:15 +0000 (22:34 +0200)]
org-footnote: Only renumber real footnotes references or definitions

* lisp/org-footnote.el (org-footnote-renumber-fn:N): Verify point is
  at a real footnote reference or definition before renumbering it.

6 years agoFix renumbering for footnotes at BOL.
Tassilo Horn [Thu, 29 Sep 2011 14:19:58 +0000 (14:19 +0000)]
Fix renumbering for footnotes at BOL.

Hi all,

org-footnote-renumber-fn:N invalidates footnotes that appear as the
first thing on a line.  Here's a test file including the recipe.

--8<---------------cut here---------------start------------->8---
* Bla

  This is a line in which the following footnote that is inserted exactly
  [fn:1] is the first thing in that line.  And now invoke
  org-footnote-renumber-fn:N and see it breaking.

* Footnotes

[fn:1] Test
--8<---------------cut here---------------end--------------->8---

Note, that in larger org files, it's likely that you don't even notice
that the footnotes break.

Once I added a patch on patchwork that fixed this issue, and that's
shown as "accepted".

I think, I've marked it as deferred or so myself because I've thought
the issue was fixed in the meantime, but that doesn't seem to be true.

Here's an updated patch.

6 years agoorg-footnote: Don't offer to create a footnote when it already exists
Nicolas Goaziou [Thu, 29 Sep 2011 13:30:46 +0000 (15:30 +0200)]
org-footnote: Don't offer to create a footnote when it already exists

* lisp/org-footnote.el (org-footnote-goto-definition): This patch
  makes sure the function says when a definition has been found.
  Thus, moving from the reference to the definition doesn't offer to
  create the latter again.

6 years agoorg-footnote: fix commit 774f9cb8e63f9739207581b81710c8b6b8cf4d01
Nicolas Goaziou [Thu, 29 Sep 2011 13:20:34 +0000 (15:20 +0200)]
org-footnote: fix commit 774f9cb8e63f9739207581b81710c8b6b8cf4d01

* lisp/org-footnote.el (org-footnote-create-definition): Explicitely
  move point after tag, if it has just been inserted.

6 years agognuplot, don't quote file names on Windows systems
Eric Schulte [Thu, 29 Sep 2011 12:54:39 +0000 (06:54 -0600)]
gnuplot, don't quote file names on Windows systems

  Thanks to Alex Vorobiev for suggesting this change

* lisp/ob-gnuplot.el (org-babel-execute:gnuplot): Don't quote file
  names on Windows systems.

6 years agoorg-footnote: ensure footnote tag is inserted after footnotes in non-Org buffers
Nicolas Goaziou [Wed, 28 Sep 2011 17:07:38 +0000 (19:07 +0200)]
org-footnote: ensure footnote tag is inserted after footnotes in non-Org buffers

* lisp/org-footnote.el (org-footnote-create-definition): When the tag
  is missing, it is created before any existing footnote, or at end of
  buffer.  In the latter case, the marker pointing at the position
  where the new footnote is going to be inserted (at end of buffer)
  stays before the tag.  This patch makes sure that the marker will be
  kept after the tag.

6 years agoRemoved OpenDocument rng files and v1.1 rnc file
Jambunathan K [Wed, 28 Sep 2011 06:34:17 +0000 (12:04 +0530)]
Removed OpenDocument rng files and v1.1 rnc file

* contrib/odt/OASIS: Removed.  The rng files are needed only for generating
  rnc files.  They are not needed for integrating with Emacs proper.

* contrib/odt/etc/schema/od-schema-v1.1.rnc: Removed.  Just go with 1.2

Should the deleted files be needed later, they can always be resurructed
from the git repo.

6 years agoForce left-to-right paragraphs in Org buffers.
Eli Zaretskii [Tue, 27 Sep 2011 17:33:09 +0000 (19:33 +0200)]
Force left-to-right paragraphs in Org buffers.

* org.el (org-mode): Force left-to-right paragraphs in Org
buffers.  For a related discussions, see

6 years agoless hacky check for executables when loading tests
Eric Schulte [Mon, 26 Sep 2011 12:16:55 +0000 (06:16 -0600)]
less hacky check for executables when loading tests

* testing/org-test.el (org-test-for-executable): Less hacky check for
  executables when loading tests.

6 years agoorg-odt.el: When zip command fails, log its output as a message
Jambunathan K [Sun, 25 Sep 2011 18:45:53 +0000 (00:15 +0530)]
org-odt.el: When zip command fails, log its output as a message

* contrib/lisp/org-odt.el (org-odt-save-as-outfile): When the
zip command fails, spit out the output it generates to
"*Messages*" buffer.

6 years agoob-asymptote: silence byte-compiler
Nicolas Goaziou [Sun, 25 Sep 2011 14:19:27 +0000 (16:19 +0200)]
ob-asymptote: silence byte-compiler

* lisp/ob-asymptote.el (org-babel-asymptote-define-type): silence byte-compiler.

6 years agoUse macro to compose html link export tests
David Maus [Sun, 25 Sep 2011 07:49:39 +0000 (09:49 +0200)]
Use macro to compose html link export tests

* lisp/test-org-html.el (org-test-html/export-link): New
macro. Compose link export test.
(test-org-html/export-link-alist): Remove factory variable and
function, use new macro instead.

6 years agoMake sure Org mode is turned on after loading the example file
David Maus [Sun, 25 Sep 2011 07:26:50 +0000 (09:26 +0200)]
Make sure Org mode is turned on after loading the example file

* org-test.el (org-test-in-example-file): Make sure Org mode is turned
on after loading the example file.

6 years agoorg tests using throw/catch rather than errors to avoid loading unsupported tests
Eric Schulte [Sat, 24 Sep 2011 21:57:05 +0000 (15:57 -0600)]
org tests using throw/catch rather than errors to avoid loading unsupported tests

6 years agoFixed an incorrect paren placement
John Wiegley [Sat, 24 Sep 2011 17:06:25 +0000 (12:06 -0500)]
Fixed an incorrect paren placement

6 years agoupdate function documentation for `org-test-with-temp-text'
Eric Schulte [Fri, 23 Sep 2011 21:49:31 +0000 (15:49 -0600)]
update function documentation for `org-test-with-temp-text'

* testing/org-test.el (org-test-with-temp-text): Update function documentation.

6 years agocatching more general errors during recursive load of test files
Eric Schulte [Fri, 23 Sep 2011 15:57:40 +0000 (09:57 -0600)]
catching more general errors during recursive load of test files

* testing/org-test.el (org-test-load): Catching more general errors
  during recursive load.

6 years agotesting that results are duplicated -- By Sebastien Vauban
Eric Schulte [Fri, 23 Sep 2011 15:50:46 +0000 (09:50 -0600)]
testing that results are duplicated -- By Sebastien Vauban

* testing/lisp/test-ob.el (test-org-babel/just-one-results-block):
  Ensure that result blocks are not duplicated.

6 years agocode cleanliness in test-ob.el
Eric Schulte [Fri, 23 Sep 2011 15:50:01 +0000 (09:50 -0600)]
code cleanliness in test-ob.el

* testing/lisp/test-ob.el (test-org-babel/multi-line-header-regexp):
  Code cleanliness.
  (test-org-babel/inline-src_blk-default-results-replace-line-2): Code
  (test-org-babel/inline-src_blk-manual-results-replace): Code
  (test-org-babel/inline-src_blk-results-silent): Code cleanliness.
  (test-org-babel/inline-src_blk-results-raw): Code cleanliness.
  (test-org-babel/inline-src_blk-results-scalar): Code cleanliness.
  (test-org-babel/inline-src_blk-results-verbatim): Code cleanliness.
  (test-org-babel/no-defaut-value-for-var): Code cleanliness.

6 years agoonly load those test files for which the required executables are present
Eric Schulte [Wed, 21 Sep 2011 22:34:43 +0000 (16:34 -0600)]
only load those test files for which the required executables are present

* testing/org-test.el (org-exe-not-found): An error type used to
  signal a missing executable
  (org-test-for-executable): A function used by test files to throw an
  error if a required executable is not present.
  (org-test-load): Simply skip files for which the required
  executables are not present.

* testing/lisp/test-ob-R.el: Conditional loading.
* testing/lisp/test-ob-awk.el: Conditional loading.
* testing/lisp/test-ob-fortran.el: Conditional loading.

6 years agofix leftover cruft in test-ob-R.el
Eric Schulte [Wed, 21 Sep 2011 19:31:38 +0000 (13:31 -0600)]
fix leftover cruft in test-ob-R.el

6 years agoadding a file for R tests
Eric Schulte [Wed, 21 Sep 2011 12:57:07 +0000 (06:57 -0600)]
adding a file for R tests

* testing/lisp/test-ob-R.el (test-ob-R/simple-session): Simple session

6 years agoRefactor tests to use `org-test-with-temp-text' * testing/lisp/test-ob.el: refactor
Martyn Jago [Wed, 21 Sep 2011 04:06:44 +0000 (05:06 +0100)]
Refactor tests to use `org-test-with-temp-text' * testing/lisp/test-ob.el: refactor

6 years agofix bug in R session evaluation
Eric Schulte [Wed, 21 Sep 2011 12:52:20 +0000 (06:52 -0600)]
fix bug in R session evaluation

* lisp/ob-R.el (org-babel-R-evaluate): Fix bug in R session

6 years agoNew vars: org-habit-today-glyph, org-habit-completed-glyph
John Wiegley [Wed, 21 Sep 2011 09:09:49 +0000 (04:09 -0500)]
New vars: org-habit-today-glyph, org-habit-completed-glyph

6 years agoconfigurable property name for bibtex entry types
Eric Schulte [Tue, 20 Sep 2011 15:20:53 +0000 (09:20 -0600)]
configurable property name for bibtex entry types

* lisp/org-bibtex.el (org-bibtex-type-property-name): Configurable
  property name for bibtex entry types.
  (org-bibtex-headline): Use new configurable property name.
  (org-bibtex-check): Use new configurable property name.
  (org-bibtex-create): Use new configurable property name.
  (org-bibtex-write): Use new configurable property name.

6 years agoModifications to enable test script to run with emacs-23 and emacs-22 * testing/org...
Martyn Jago [Tue, 20 Sep 2011 07:44:24 +0000 (08:44 +0100)]
Modifications to enable test script to run with emacs-23 and emacs-22 * testing/org-test.el: enable test script to run with emacs-23 and emacs-22 * testing/lisp/test-org-exp.el: added org-ascii requirement

6 years agoorg-test-with-temp-text allows variable inputs holding strings
Eric Schulte [Tue, 20 Sep 2011 15:01:11 +0000 (09:01 -0600)]
org-test-with-temp-text allows variable inputs holding strings

* testing/org-test.el (org-test-with-temp-text): Allow variable inputs
  holding strings.

6 years agoMerge branch 'master' of
Carsten Dominik [Tue, 20 Sep 2011 13:41:19 +0000 (15:41 +0200)]
Merge branch 'master' of

6 years agoRemove unnecessary `concat'
Carsten Dominik [Tue, 20 Sep 2011 08:32:41 +0000 (10:32 +0200)]
Remove unnecessary `concat'

* lisp/org.el (org-paste-subtree): Remove unnecessary `concat'.

6 years agoorg.el (org-paste-subtree): Remove useless (concat ...).
Bastien Guerry [Tue, 20 Sep 2011 06:37:23 +0000 (08:37 +0200)]
org.el (org-paste-subtree): Remove useless (concat ...).

* org.el (org-paste-subtree): Remove useless (concat ...).

See change from Stefan Monnier here:

6 years agoConvenience macro for testing.
Eric Schulte [Mon, 19 Sep 2011 16:01:32 +0000 (10:01 -0600)]
Convenience macro for testing.

* testing/org-test.el (org-test-with-temp-text): Convenience macro for

6 years agoExplicitely set coding system for unescaped string
David Maus [Sun, 18 Sep 2011 14:40:01 +0000 (16:40 +0200)]
Explicitely set coding system for unescaped string

* test-org.el (test-org/org-link-unescape-ascii-extended-char):
Explicitely set coding system for unescaped string.

Needed for Emacs22 to pass these tests. The input string is extended
ASCII which is covered by latin-1 coding system.

6 years agoConditionally define `special-mode' for Emacs22
David Maus [Sun, 18 Sep 2011 08:35:50 +0000 (10:35 +0200)]
Conditionally define `special-mode' for Emacs22

* org-test.el: Conditionally define `special-mode' for Emacs22.

Copied definition from Emacs23's simple.el.

6 years agoreplacing usage of characterp with integerp (which should work w/Emacs22)
Eric Schulte [Sat, 17 Sep 2011 20:52:19 +0000 (14:52 -0600)]
replacing usage of characterp with integerp (which should work w/Emacs22)

* contrib/babel/langs/ob-fortran.el (org-babel-fortran-var-to-fortran):
  Replacing usage of characterp with integerp (which should work w/Emacs22).
* lisp/ob-C.el (org-babel-C-var-to-C): Replacing usage of characterp
  with integerp (which should work w/Emacs22).

6 years agoorg-odt.el: Typeset display equations using tables
Jambunathan K [Sat, 17 Sep 2011 18:39:06 +0000 (00:09 +0530)]
org-odt.el: Typeset display equations using tables

* contrib/odt/styles/OrgOdtContentTemplate.xml: Add bottom
margin to "OrgTable".  Modify border properties of
"OrgTblCell*"s.  Add "OrgEquation" table styles for
typesetting of display equations.

* contrib/odt/styles/OrgOdtStyles.xml: Added various "graphic"
styles for formatting of inline and display equations.
Modified names of some "graphic" styles for images for reasons
of consistency.

* contrib/lisp/org-odt.el (org-export-odt-do-format-image):
Removed.  This is now folded in to
`org-export-odt-format-image'.  A part of this is extracted in
to `org-odt-format-entity'.
(org-odt-entity-frame-styles): New variable.
(org-odt-format-entity): New function.  See previous entries.
(org-export-odt-format-image): Modified.  See previous
(org-export-odt-do-format-formula): Removed.  These functions
are now folded within `org-export-odt-format-formula'.
(org-export-odt-format-formula): Modified as noted above.
Also use `org-odt-format-entity'.
(org-odt-format-frame, org-odt-format-textbox): Modified
signature to facilitate elegant introduction of
(org-odt-format-inlinetask): Honor change in signature.
(org-odt-label-def-ref-spec): Added an entry for "Equation".

Only MathML equations are typeset using tables.  Dvipng equations are still
typeset as regular images.

6 years agoorg-footnote: check context around definition at a proper place
Nicolas Goaziou [Sat, 17 Sep 2011 10:01:54 +0000 (12:01 +0200)]
org-footnote: check context around definition at a proper place

* lisp/org-footnote.el (org-footnote-at-definition-p): Context must be
  valid at the beginning of line, not at point.

6 years agoorg-odt.el: Improve how labels are applied and generated.
Jambunathan K [Fri, 16 Sep 2011 18:42:02 +0000 (00:12 +0530)]
org-odt.el: Improve how labels are applied and generated.

* contrib/lisp/org-odt.el
(org-odt-entity-labels-alist, org-odt-entity-counts-plist)
(org-odt-label-def-ref-spec): New variables.
(org-odt-init-outfile): Reset above variables.
(org-odt-add-label-definition, org-odt-get-label-definition)
(org-odt-fixup-label-references): New functions.
(org-export-odt-preprocess-label-references): Modified.
(org-odt-end-export): Call `org-odt-fixup-label-references'.
(org-odt-parse-label): Removed
(org-odt-default-entity): Removed.
(org-odt-format-entity-caption): Fixed signature so that
category param is no longer optional.  Use
(org-export-odt-do-format-image): Pass the mandatory category
param to `org-odt-format-entity-caption'.

* contrib/odt/styles/OrgOdtContentTemplate.xml: Add Figure and
Equation as sequence declarations.

Most of these changes can be pushed to org-exp.el.  For now park the
changes locally to org-odt.el.

6 years agobetter delimiting of Org-mode text preceding a code block
Eric Schulte [Fri, 16 Sep 2011 15:52:09 +0000 (09:52 -0600)]
better delimiting of Org-mode text preceding a code block

  Thanks to Christopher Genovese for this change

* lisp/ob-tangle.el (org-babel-tangle-collect-blocks): Better
  delimiting of Org-mode text preceding a code block.

6 years agoisolating dangerous testing examples
Eric Schulte [Fri, 16 Sep 2011 15:23:29 +0000 (09:23 -0600)]
isolating dangerous testing examples

* testing/examples/ To house the dangerous.
* testing/examples/ (an): Removed a trouble maker.

6 years agoAdd test checking that any variable declared with no default value will generate...
Sebastien Vauban [Fri, 16 Sep 2011 10:07:19 +0000 (12:07 +0200)]
Add test checking that any variable declared with no default value will generate a proper error message.

6 years agoAdd test checking that any variable declared with no default value will generate...
Sebastien Vauban [Fri, 16 Sep 2011 10:06:21 +0000 (12:06 +0200)]
Add test checking that any variable declared with no default value will generate a proper error message.

6 years agoDon't delete variable values when checking for assignment.
Eric Schulte [Fri, 16 Sep 2011 13:43:07 +0000 (07:43 -0600)]
Don't delete variable values when checking for assignment.

* lisp/ob.el (org-babel-get-src-block-info): Fixing bug, accidentally
  deleted variable values.

6 years agocustomizable processing of Org-mode text used as comments in tangled source-code...
Eric Schulte [Thu, 15 Sep 2011 22:00:10 +0000 (16:00 -0600)]
customizable processing of Org-mode text used as comments in tangled source-code files

* lisp/ob-tangle.el (org-babel-process-comment-text): Customizable
  function to process comment text.
  (org-babel-tangle-collect-blocks): Make use of new customizable
  processing function.
  (org-babel-spec-to-string): Call customizable function rather than

6 years agoFix check for feature Org mode
David Maus [Fri, 16 Sep 2011 04:48:16 +0000 (06:48 +0200)]
Fix check for feature Org mode

* org-test.el: Fix check for feature Org mode.

6 years agoob-R: don't process output when "scalar" or "verbatim"
Eric Schulte [Thu, 15 Sep 2011 21:43:35 +0000 (15:43 -0600)]
ob-R: don't process output when "scalar" or "verbatim"

* lisp/ob-R.el (org-babel-execute:R): Collect and pass along the
  (org-babel-R-evaluate): Accept result-params and if "scalar" or
  "verbatim" don't process output.
  (org-babel-R-evaluate-session): Accept result-params and if "scalar"
  or "verbatim" don't process output.

6 years agotest the combination of code block results wrapper and type
Eric Schulte [Thu, 15 Sep 2011 21:29:10 +0000 (15:29 -0600)]
test the combination of code block results wrapper and type

* testing/examples/ (an): Test the combination of code block
  results wrapper and type.
* testing/lisp/test-ob.el (test-org-babel/combining-scalar-and-raw-result-types):
  Test the combination of code block results wrapper and type.

6 years agodifferentiate between result types and wrappers
Eric Schulte [Thu, 15 Sep 2011 21:22:14 +0000 (15:22 -0600)]
differentiate between result types and wrappers

* lisp/ob.el (org-babel-merge-params): Differentiate between result
  types and wrappers.

6 years agoCheck that functional-syntax variables are initialized.
Eric Schulte [Thu, 15 Sep 2011 15:24:29 +0000 (09:24 -0600)]
Check that functional-syntax variables are initialized.

* lisp/ob.el (org-babel-get-src-block-info): Check that
  functional-syntax variables are initialized.