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.

6 years agoAdding a note for a future enhancement.
Eric Schulte [Thu, 15 Sep 2011 15:11:12 +0000 (09:11 -0600)]
Adding a note for a future enhancement.

* lisp/ob.el (org-babel-check-src-block): Adding a note for a future

6 years agoorg-odt.el: Support for styling of tables using table templates
Jambunathan K [Tue, 13 Sep 2011 14:07:13 +0000 (19:37 +0530)]
org-odt.el: Support for styling of tables using table templates

* contrib/lisp/org-odt.el (org-odt-table-style)
(org-odt-table-style-spec): New variables.
(org-export-odt-table-styles): New user-customizable variable.
(org-odt-begin-table): Init `org-odt-table-style' from the
(org-odt-get-table-cell-styles): New function.
(org-odt-end-table): Use the above function.
(org-odt-get-style-name-for-table-cell): Removed.  Now folded
in to `org-odt-get-table-cell-styles'.
(org-odt-get-style-name-cookie-for-table-cell): Modified to
accommodate new user-defined styles.

Users now have the option of choosing Org's own way of styling or
using custom styling.

6 years agoMerge branch 'master' of
Carsten Dominik [Wed, 14 Sep 2011 06:54:53 +0000 (08:54 +0200)]
Merge branch 'master' of

6 years agoRestore point when exporting a subtree
Carsten Dominik [Wed, 14 Sep 2011 05:48:49 +0000 (07:48 +0200)]
Restore point when exporting a subtree

* lisp/org-exp.el (org-export): Restore point when exporting a subtree.

6 years agomore robust to code blocks with empty bodies
Eric Schulte [Tue, 13 Sep 2011 15:36:03 +0000 (09:36 -0600)]
more robust to code blocks with empty bodies
* lisp/ob.el (org-babel-parse-src-block-match): More robust to code
  blocks with empty bodies.

6 years agoDon't error on empty code block body.
Eric Schulte [Tue, 13 Sep 2011 14:57:29 +0000 (08:57 -0600)]
Don't error on empty code block body.

* lisp/ob.el (org-babel-parse-src-block-match): Don't error on empty
  code block body.

6 years agofixed author information
Eric Schulte [Mon, 12 Sep 2011 16:42:22 +0000 (10:42 -0600)]
fixed author information

* testing/lisp/test-ob-awk.el: Fixed author information.
* testing/lisp/test-ob-fortran.el: Fixed author information.

6 years agoAdd missing FSF / author headers and org-test dependency to some test files * testing...
Martyn Jago [Mon, 12 Sep 2011 16:07:21 +0000 (17:07 +0100)]
Add missing FSF / author headers and org-test dependency to some test files * testing/lisp/test-ob-awk.el: * testing/lisp/test-ob-fortran.el: * testing/lisp/test-ob-lilypond.el: * testing/lisp/test-ob.el: * testing/lisp/test-org-exp.el: Add missing FSF / author headers and org-test dependency to some test files.

6 years agoRemove jump.el dependency from test execution * testing/org-test.el: Remove jump...
Martyn Jago [Mon, 12 Sep 2011 15:50:28 +0000 (16:50 +0100)]
Remove jump.el dependency from test execution * testing/org-test.el: Remove jump.el dependency from test execution removing the need for a user to install git submodules

6 years agoFix previous commit
Jambunathan K [Mon, 12 Sep 2011 11:56:59 +0000 (17:26 +0530)]
Fix previous commit

6 years agoReplace OrgOdtAutomaticStyles.xml with OrgOdtContentTemplate.xml
Jambunathan K [Mon, 12 Sep 2011 11:49:14 +0000 (17:19 +0530)]
Replace OrgOdtAutomaticStyles.xml with OrgOdtContentTemplate.xml

* contrib/odt/styles/OrgOdtAutomaticStyles.xml: Removed

* contrib/odt/styles/OrgOdtContentTemplate.xml: Added. This
file is now a fully-formed "content.xml" file but with "empty"
content. Note that the original "OrgOdtAutomaticStyles.xml"
was just an xml fragment.

* contrib/lisp/org-odt.el
(org-odt-document-content-header): Removed.
(org-export-odt-automatic-styles-file): Removed.
(org-export-odt-content-template-file): Renamed from
(org-odt-data-dir): Update docstring.
(org-odt-begin-office-body, org-odt-begin-document-content):
Modified to accomodate changes introduced by the new
"OrgOdtContentTemplate.xml" file.

6 years agore-wrapped test to prevent failure during batch execution
Eric Schulte [Sun, 11 Sep 2011 20:35:13 +0000 (14:35 -0600)]
re-wrapped test to prevent failure during batch execution

* testing/lisp/test-ob.el (test-org-babel/inline-src-blocks):
  Re-wrapped test to prevent failure during batch execution.

6 years agoall tests should now pass on Emacs23
Eric Schulte [Sun, 11 Sep 2011 20:19:02 +0000 (14:19 -0600)]
all tests should now pass on Emacs23

* testing/lisp/test-ob.el (test-org-babel/org-babel-get-inline-src-block-matches):
  All tests should now pass on Emacs23.

6 years agoUnescape plain link before open
David Maus [Sun, 11 Sep 2011 14:50:22 +0000 (16:50 +0200)]
Unescape plain link before open

* org.el (org-open-at-point): Unescape plain link.

This should fix a problem with open plain links reported by
Sebastien Vauban.

6 years agoRemove unnecessary link unescape
David Maus [Sun, 11 Sep 2011 14:01:59 +0000 (16:01 +0200)]
Remove unnecessary link unescape

* org-html.el (org-html-handle-links): Remove unnecessary link

PATH is already unescaped and should never be escaped twice. Big
thanks to Jambunathan K for analyzing the problem.

6 years agoBetter Org-mode initialization for batch tests.
Eric Schulte [Fri, 9 Sep 2011 20:21:06 +0000 (14:21 -0600)]
Better Org-mode initialization for batch tests.

  Thanks to Martyn Jago for this patch.

* testing/org-test.el (org-test-dir): Better Org-mode initialization
  for batch tests.

6 years ago* testing/lisp/test-ob.el: Fixed typo
Martyn Jago [Thu, 8 Sep 2011 21:34:38 +0000 (22:34 +0100)]
* testing/lisp/test-ob.el: Fixed typo

6 years ago* testing/lisp/test-ob.el: More tests for inline source blocks execution via org...
Martyn Jago [Thu, 8 Sep 2011 15:50:26 +0000 (16:50 +0100)]
* testing/lisp/test-ob.el: More tests for inline source blocks execution via org-ctrl-c-ctrl-c

6 years agoRevert "org.el (org-fixup-indentation): Correctly indent meta lines."
Bastien Guerry [Fri, 9 Sep 2011 17:47:41 +0000 (19:47 +0200)]
Revert "org.el (org-fixup-indentation): Correctly indent meta lines."

This reverts commit 6b04befa48f2aed0a44d25bced54adeda4658bf0.

6 years agoorg-lparse.el: Rename table routines
Jambunathan K [Thu, 8 Sep 2011 19:08:31 +0000 (00:38 +0530)]
org-lparse.el: Rename table routines

* contrib/lisp/org-lparse.el (org-lparse-insert-org-table):
Renamed from `org-lparse-do-format-org-table'.
(org-lparse-insert-list-table): Renamed from
(org-lparse-insert-table-table): Renamed from
(org-lparse-insert-org-table, org-lparse-format-org-table)
(org-lparse-format-list-table, org-lparse-format-table-table):
Propagate above renamings.

* contrib/lisp/org-odt.el
(org-export-odt-do-format-numbered-formula): Propagate above

Maintain a clear distinction between format and insert behaviours.

6 years agoorg-odt.el: Set mathml option
Jambunathan K [Thu, 8 Sep 2011 18:52:19 +0000 (00:22 +0530)]
org-odt.el: Set mathml option

* contrib/lisp/org-odt.el
(org-export-odt-do-preprocess-latex-fragments): Pass 'mathml
option to `org-format-latex'.