5 years agoFix bug in org-capture file+datetree+promt target type
Carsten Dominik [Tue, 6 Dec 2011 08:00:27 +0000 (09:00 +0100)]
Fix bug in org-capture file+datetree+promt target type

* lisp/org-capture.el (org-capture-set-target-location): Set the capture
default time also to the prompt time.

In the file+datetree+promt target type, the user is being asked for a
date, where to file an entry.  In the template, there can the escape
placeholders for active and inactive time stamps.  So far, these were
filled with todays date.  This patch changes this behavior, so that
also at %t and %u escaped, the date entered at the prompt will be

Reported by Erik Hetzner.

5 years agoorg-export: Cleanup #+name and #+results
Nicolas Goaziou [Sun, 4 Dec 2011 16:00:46 +0000 (17:00 +0100)]
org-export: Cleanup #+name and #+results

* lisp/org-exp.el (org-export-res/src-name-cleanup): Remove #+name and
  #+results lines during preprocess.

Now Babel doesn't handle anymore those keywords cleanup (as #+name may
be used for other thing than code evaluation), that task is moved to
org-export.el.  See commit 25a0a0212193ecc5e910696301b3a64a51f837e0.

5 years agoorg.texi: Fix typos.
Bastien Guerry [Sun, 4 Dec 2011 10:44:23 +0000 (11:44 +0100)]
org.texi: Fix typos.

Thanks to Paul Eggert for spotting this and fixing it in Emacs.

5 years agocontrib/lisp/org-element: Re-order a function within the file
Nicolas Goaziou [Thu, 1 Dec 2011 14:42:06 +0000 (15:42 +0100)]
contrib/lisp/org-element: Re-order a function within the file

5 years agocontrib/lisp/org-element: Do not map function to ignored elements or objects
Nicolas Goaziou [Thu, 1 Dec 2011 13:57:59 +0000 (14:57 +0100)]
contrib/lisp/org-element: Do not map function to ignored elements or objects

* contrib/lisp/org-element.el (org-element-map): In an export
  situation, only map function on included elements or objects.

5 years agocontrib/lisp/org-export: Fix headline numbering
Nicolas Goaziou [Thu, 1 Dec 2011 13:01:32 +0000 (14:01 +0100)]
contrib/lisp/org-export: Fix headline numbering

* contrib/lisp/org-export.el (org-export-persistent-properties-list):
  Remove unused persistent properties.
(org-export-initialize-persistent-properties): Delegate headline
  numbering alist to `org-export-collect-headline-numbering'.
(org-export-collect-headline-numbering): New function.
(org-export-update-info): Remove part relative to headline numbering.
(org-export-get-headline-number): Use new `:headline-numbering' to get
  current headline number.

Headline numbering is not done on demand anymore, but built once and
for all at the beginning of the export process, and stored in an
alist, accessible through the `:headline-numbering' property in the
communication channel.

5 years agoEXPERIMENTAL/org-latex: Small refactoring.
Nicolas Goaziou [Tue, 29 Nov 2011 20:37:15 +0000 (21:37 +0100)]
EXPERIMENTAL/org-latex: Small refactoring.

* EXPERIMENTAL/org-latex.el (org-latex-footnote-reference): Small

5 years agofix compiler warnings in ob-picolisp
Eric Schulte [Tue, 29 Nov 2011 16:16:14 +0000 (09:16 -0700)]
fix compiler warnings in ob-picolisp

* lisp/ob-picolisp.el (ob-comint): Required.
  (comint): Required.
  (cl): Required.
  (run-picolisp): Declared.
  (org-babel-execute:picolisp): Capture free variable, and replace
  function from cl-extra with core function.

5 years agomoving ob-picolisp into the core
Eric Schulte [Tue, 29 Nov 2011 16:05:31 +0000 (09:05 -0700)]
moving ob-picolisp into the core

Thanks to Thorsten Jolitz for contributing support for this new

* Makefile (LISPF): Add ob-picolisp to the Makefile.
* contrib/babel/langs/ob-picolisp.el: Remove from contrib.
* lisp/ob-picolisp.el: Add to core lisp directory.
* lisp/org.el (org-babel-load-languages): Add Pico Lisp to the list of
  supported code block languages.

5 years agoimproved warnings of bibtex errors during multi-headline export
Eric Schulte [Tue, 29 Nov 2011 15:56:27 +0000 (08:56 -0700)]
improved warnings of bibtex errors during multi-headline export

* lisp/org-bibtex.el (org-bibtex): Now catches bibtex errors and
  directs the user to the location of the error.

5 years agoEXPERIMENTAL/org-latex: LaTeX back-end for generic exporter
Nicolas Goaziou [Mon, 28 Nov 2011 22:36:51 +0000 (23:36 +0100)]
EXPERIMENTAL/org-latex: LaTeX back-end for generic exporter

* EXPERIMENTAL/org-latex.el (org-latex-option-alist,
  org-latex-default-class, org-latex-classes
  org-latex-inputenc-alist, org-latex-date-format,
  org-latex-title-command, org-latex-format-headline-function, org-latex-emphasis-alist,
  org-latex-footnote-separator, org-latex-active-timestamp-format,
  org-latex-diary-timestamp-format, org-latex-image-default-option,
  org-latex-default-figure-position, org-latex-inline-image-extensions,
  org-latex-default-table-environment, org-latex-tables-centered,
  org-latex-tables-verbatim, org-latex-table-caption-above,
  org-latex-format-inlinetask-function, org-latex-listings, org-latex-listings-langs,
  org-latex-listings-options, org-latex-minted-langs,
  org-latex-minted-options, org-latex-quotes,
  org-latex-custom-lang-environments): New variables.
(org-latex--caption/label-string, org-latex--guess-inputenc,
  org-latex--find-verb-separator, org-latex--make-option-string,
  org-latex--quotation-marks, org-latex--wrap-label,
  org-latex-template, org-latex-center-block, org-latex-drawer,
  org-latex-dynamic-block, org-latex-emphasis, org-latex-entity,
  org-latex-example-block, org-latex-export-snippet,
  org-latex-export-block, org-latex-fixed-width,
  org-latex-footnote-reference, org-latex-headline,
  org-latex-horizontal-rule, org-latex-inline-src-block,
  org-latex-inlinetask, org-latex-item, org-latex-keyword,
  org-latex-latex-environment, org-latex-latex-fragment,
  org-latex-line-break, org-latex-link--inline-image, org-latex-link,
  org-latex-macro, org-latex-paragraph, org-latex-plain-list,
  org-latex-plain-text, org-latex-property-drawer,
  org-latex-quote-block, org-latex-quote-section,
  org-latex-radio-target, org-latex-special-block,
  org-latex-src-block, org-latex-statistics-cookie,
  org-latex-subscript, org-latex-superscript,
  org-latex-table--format-string, org-latex-table--align-string,
  org-latex-table, org-latex-target, org-latex-time-stamp,
  org-latex-verbatim, org-latex-verse-block): New functions.

5 years agocontrib/lisp/org-export: Fix visibility influence on list parsing
Nicolas Goaziou [Mon, 28 Nov 2011 19:14:20 +0000 (20:14 +0100)]
contrib/lisp/org-export: Fix visibility influence on list parsing

* contrib/lisp/org-export.el (org-export-with-current-buffer-copy):
  Full invisibility prevents `current-column' from returning useful
  values.  Thus, keep visibility related text-properties and set
  `buffer-invisibility-spec' to nil.

5 years agonote that colnames behavior may differ across languages
Eric Schulte [Mon, 28 Nov 2011 18:21:52 +0000 (11:21 -0700)]
note that colnames behavior may differ across languages

* doc/org.texi (colnames): Note that colnames behavior may differ
  across languages.

5 years agotests for the colnames header argument
Eric Schulte [Mon, 28 Nov 2011 08:55:28 +0000 (01:55 -0700)]
tests for the colnames header argument

5 years agoorg-agenda.el (org-agenda-dim-blocked-tasks): Fix typo.
Bastien Guerry [Mon, 28 Nov 2011 14:23:27 +0000 (15:23 +0100)]
org-agenda.el (org-agenda-dim-blocked-tasks): Fix typo.

* org-agenda.el (org-agenda-dim-blocked-tasks): Fix typo.

Thanks to Paul Eggert for spotting this and fixing it in Emacs trunk.

5 years agoorg.texi (Weekly/daily agenda, Agenda commands): Fix typos.
Bastien Guerry [Mon, 28 Nov 2011 14:17:15 +0000 (15:17 +0100)]
org.texi (Weekly/daily agenda, Agenda commands): Fix typos.

* org.texi (Weekly/daily agenda, Agenda commands): Fix typos.

Thanks to Paul Eggert for spotting this.

5 years agoFix typo fixed in Emacs trunk.
Bastien Guerry [Mon, 28 Nov 2011 14:13:04 +0000 (15:13 +0100)]
Fix typo fixed in Emacs trunk.

* ob.el (org-babel-execute-src-block): Fix typo.

Thanks to Juanma Barranquero for spotting this.

5 years agoFix typos fixed in Emacs trunk.
Bastien Guerry [Mon, 28 Nov 2011 14:11:52 +0000 (15:11 +0100)]
Fix typos fixed in Emacs trunk.

* org-freemind.el (org-freemind-write-mm-buffer): Fix typo.

* org-colview.el (org-columns-edit-value) (org-columns-next-allowed-value):
  Fix typos.

* org-bibtex.el (org-bibtex-autogen-keys): Fix typo.

* org-clock.el (org-clock-special-range): Fix typo.

Thanks to Paul Eggert for these fixes.

5 years agoorg.el: Fix two typos in docstrings.
Bastien Guerry [Mon, 28 Nov 2011 14:07:49 +0000 (15:07 +0100)]
org.el: Fix two typos in docstrings.

* org.el (org-link-unescape, org-link-unescape-compound): Fix two
  typos in docstrings.

5 years ago* lisp/ob-R.el: Added tikzDevice support.
Thomas Dye [Sun, 27 Nov 2011 07:17:00 +0000 (21:17 -1000)]
* lisp/ob-R.el: Added tikzDevice support.

5 years agocontrib/lisp/org-export: Fix a docstring.
Nicolas Goaziou [Fri, 25 Nov 2011 18:33:23 +0000 (19:33 +0100)]
contrib/lisp/org-export: Fix a docstring.

* contrib/lisp/org-export.el (org-export-option-alist): Fix docstring.

5 years agocontrib/lisp/org-export.el: Fix misleading comments about transcoders
Nicolas Goaziou [Fri, 25 Nov 2011 18:06:19 +0000 (19:06 +0100)]
contrib/lisp/org-export.el: Fix misleading comments about transcoders

* contrib/lisp/org-export.el: Fix misleading comments about transcoders.

5 years agoorg-babel-exp-lob-one-liners should not parse the entire buffer.
Jérémy Compostella [Thu, 24 Nov 2011 15:20:00 +0000 (16:20 +0100)]
org-babel-exp-lob-one-liners should not parse the entire buffer.

The org-babel-exp-lob-one-liners search "call" pattern through the entire
buffer instead of the region given as arguments.

5 years agocontrib/org-export: Generic Export Engine For Org
Nicolas Goaziou [Fri, 25 Nov 2011 15:02:27 +0000 (16:02 +0100)]
contrib/org-export: Generic Export Engine For Org

* contrib/lisp/org-export.el (org-export-collect-options,
  org-export-parse-option-keyword, org-export-get-subtree-options,
  org-export-get-inbuffer-options, org-export-get-global-options,
  org-export-initial-options, org-export-confirm-letbind,
  org-export-use-select-tags-p, org-export-get-min-level,
  org-export-get-point-max, org-export-update-info,
  org-export-set-property, org-export-data,
  org-export-secondary-string, org-export-skip-p,
  org-export-interpret-p, org-export-filter-apply-functions,
  org-export-as, org-export-to-buffer, org-export-get-relative-level,
  org-export-get-headline-number, org-export-number-to-roman,
  org-export-first-sibling-p, org-export-last-sibling-p,
  org-export-included-file, org-export-get-file-contents,
  org-export-parse-included-file, org-export-solidify-link-text,
  org-export-get-coderef-format, org-export-inline-image-p,
  org-export-resolve-fuzzy-link, org-export-expand-macro,
  org-export-handle-code, org-export-table-format-info,
  org-export-clean-table, org-export-get-headlines,
  org-export-collect-elements, org-export-collect-tables,
  org-export-get-figures, org-export-collect-listings): New functions.
(org-export-max-depth, org-export-option-alist,
  org-export-special-keywords, org-export-persistent-properties-list,
  org-export-persistent-properties, org-export-with-archived-trees,
  org-export-with-author, org-export-with-creator,
  org-export-creator-string, org-export-with-drawers,
  org-export-with-email, org-export-with-emphasize,
  org-export-exclude-tags, org-export-with-fixed-width,
  org-export-with-footnotes, org-export-headline-levels,
  org-export-default-language, org-export-preserve-breaks,
  org-export-with-entities, org-export-with-priority,
  org-export-with-section-numbers, org-export-select-tags,
  org-export-with-special-strings, org-export-with-sub-superscripts,
  org-export-with-toc, org-export-with-tables, org-export-with-tags,
  org-export-with-tasks, org-export-time-stamp-file,
  org-export-with-timestamps, org-export-with-todo-keywords,
  org-export-allow-BIND, org-export-snippet-translation-alist,
  org-export-filter-verbatim-functions): New variables.

5 years agoorg-odt.el: Export TOC max-level information.
Jeremy Compostella [Sat, 19 Nov 2011 12:43:39 +0000 (13:43 +0100)]
org-odt.el: Export TOC max-level information.

The TOC max level which could be specified by user is lost during the
export operation. However, this information could be useful in particular
with the ODT exporter. So if another script work on the ODT afterward and
ask to re-compute the TOC, the new TOC will keep this max level.


5 years agoorg-odt.el: Fix performance issue on manifest file writing
Jambunathan K [Thu, 24 Nov 2011 18:16:34 +0000 (23:46 +0530)]
org-odt.el: Fix performance issue on manifest file writing

* contrib/lisp/org-odt.el (org-odt-write-manifest-file): Don't
use write-region.

The org-odt-write-manifest-file function take too much time -
several seconds for 164 files. This patch provides a cheaper
implementation (hundredths of a seconds for 164 files).

Original patch by Jérémy Compostella
<>.  Rewritten by Jambunathan K to
minimize the actual number of lines changed.


I'm currently generating a road book for a trip from different
Org-Mode file and other data. It results in a 13 thousands
lines Org-Mode file and I have some performance issues. Using
the ELP package, I isolated the two main bottlenecks.

One is in org-odt : the org-odt-write-manifest-file function
is called once and takes 5.546672 seconds to write a 167 lines
file. I rewrote this function and now it takes 0.01606 seconds
to write the same file.

5 years agoorg-element: Fix parsing of src-block switches when there is more than one
Nicolas Goaziou [Thu, 24 Nov 2011 13:29:53 +0000 (14:29 +0100)]
org-element: Fix parsing of src-block switches when there is more than one

* contrib/lisp/org-element.el (org-element-src-block-parser): Previous
  regexp would only get the last switch if more than one were

5 years agoMerge branch 'master' of
David Maus [Wed, 23 Nov 2011 20:35:47 +0000 (21:35 +0100)]
Merge branch 'master' of

5 years agoRemove clocking information when preparing a clone
David Maus [Wed, 23 Nov 2011 20:35:35 +0000 (21:35 +0100)]
Remove clocking information when preparing a clone

* org.el (org-clone-subtree-with-time-shift): Remove clocking
information and empty drawers when preparing a clone.

Fixes a regression introduced by
516b2fbb8763788585ac6a9f60ad7d51c4b0aab3, reported by Bernt Hansen in

5 years ago* doc/org.texi: Augmented discussion of babel property inheritance. Put footnote...
Thomas Dye [Wed, 23 Nov 2011 18:34:31 +0000 (08:34 -1000)]
* doc/org.texi: Augmented discussion of babel property inheritance. Put footnote outside sentence ending period.

5 years agoMerge branch 'master' of
Carsten Dominik [Wed, 23 Nov 2011 06:36:23 +0000 (07:36 +0100)]
Merge branch 'master' of

5 years agoRequire parse-time for `org-read-date-get-relative'
Carsten Dominik [Wed, 23 Nov 2011 06:36:07 +0000 (07:36 +0100)]
Require parse-time for `org-read-date-get-relative'

5 years agoorg-odt.el: Fix a bug wrt label references
Jambunathan K [Wed, 23 Nov 2011 00:31:33 +0000 (06:01 +0530)]
org-odt.el: Fix a bug wrt label references

* contrib/lisp/org-odt.el (org-odt-fixup-label-references)
(org-export-odt-preprocess-label-references): Modified.

Workaround for issue reported here:

5 years agono longer strip code and result names during block preprocessing
Eric Schulte [Tue, 22 Nov 2011 15:18:26 +0000 (08:18 -0700)]
no longer strip code and result names during block preprocessing

* lisp/ob-exp.el: Don't add `org-exp-res/src-name-cleanup' to

5 years agocorrectly toggle visibility of named code blocks
Eric Schulte [Tue, 22 Nov 2011 15:05:34 +0000 (08:05 -0700)]
correctly toggle visibility of named code blocks

* lisp/ob.el (org-babel-hide-result-toggle): Skip over header argument
  lines when toggling named code block visibility.

5 years agoDon't license to kill text inside blocks when getting a title
Eric Schulte [Tue, 22 Nov 2011 14:56:00 +0000 (07:56 -0700)]
Don't license to kill text inside blocks when getting a title

* lisp/org-exp.el (org-export-grab-title-from-buffer): Don't license
  to kill text inside blocks when getting a title.

5 years agothe :eval header argument now takes 4(6) possible values
Eric Schulte [Tue, 22 Nov 2011 14:32:39 +0000 (07:32 -0700)]
the :eval header argument now takes 4(6) possible values

* doc/org.texi (eval): Documenting the full range of :eval header
  argument values.
* lisp/ob.el (org-babel-confirm-evaluate): Adding support for new
  range of :eval header arguments.
* testing/lisp/test-ob.el (test-ob/eval-header-argument): Testing the
  :eval header argument.

5 years agoRevert "Revert "new babel latex feature :imagemagick -- By Andreas Leha""
Eric Schulte [Tue, 22 Nov 2011 13:59:58 +0000 (06:59 -0700)]
Revert "Revert "new babel latex feature :imagemagick -- By Andreas Leha""

This reverts commit c6f6b3421ee9050a980f8fa0b5615e3f7136e7a8.

Andreas has now signed the FSF copyright assignment papers.

5 years ago":eval non-export" inhibits evaluation during export
Eric Schulte [Tue, 22 Nov 2011 01:19:45 +0000 (18:19 -0700)]
":eval non-export" inhibits evaluation during export

* doc/org.texi (eval): Documentation of the new :eval option.
* lisp/ob.el (org-babel-confirm-evaluate): Inhibit evaluation during
  export when eval is set to "non-export".

5 years agoNew option to update intermediate in-buffer results
Eric Schulte [Sun, 20 Nov 2011 20:19:01 +0000 (13:19 -0700)]
New option to update intermediate in-buffer results

* lisp/ob-ref.el (org-babel-update-intermediate): New custom variable.
  (org-babel-ref-resolve): Optionally update the in-buffer results of
  code blocks which are evaluated to resolve references.

5 years agoMore documentation of accumulated properties
Eric Schulte [Mon, 21 Nov 2011 16:19:23 +0000 (09:19 -0700)]
More documentation of accumulated properties

5 years ago* doc/org.texi: Add accumulated properties
Thomas Dye [Mon, 21 Nov 2011 04:27:09 +0000 (18:27 -1000)]
* doc/org.texi: Add accumulated properties

5 years agoorg-element: Parser for Org syntax
Nicolas Goaziou [Mon, 21 Nov 2011 07:11:47 +0000 (08:11 +0100)]
org-element: Parser for Org syntax

* contrib/lisp/org-element.el (org-element-center-block-parser,
  org-element-center-block-interpreter, org-element-drawer-parser,
  org-element-drawer-interpreter, org-element-dynamic-block-parser,
  org-element-headline-parser, org-element-headline-interpreter,
  org-element-inlinetask-parser, org-element-inlinetask-interpreter,
  org-element-item-parser, org-element-item-interpreter,
  org-element-plain-list-parser, org-element-plain-list-interpreter,
  org-element-babel-call-parser, org-element-babel-call-interpreter,
  org-element-comment-parser, org-element-comment-interpreter,
  org-element-keyword-parser, org-element-keyword-interpreter,
  org-element-paragraph-parser, org-element-paragraph-interpreter,
  org-element-src-block-parser, org-element-src-block-interpreter,
  org-element-table-parser, org-element-table-interpreter,
  org-element-verse-block-interpreter, org-element-emphasis-parser,
  org-element-text-markup-successor, org-element-entity-parser,
  org-element-line-break-parser, org-element-line-break-interpreter,
  org-element-line-break-successor, org-element-link-parser,
  org-element-link-interpreter, org-element-link-successor,
  org-element-macro-parser, org-element-macro-interpreter,
  org-element-macro-successor, org-element-radio-target-parser,
  org-element-subscript-parser, org-element-subscript-interpreter,
  org-element-superscript-interpreter, org-element-target-parser,
  org-element-target-interpreter, org-element-target-successor,
  org-element-time-stamp-parser, org-element-time-stamp-interpreter,
  org-element-time-stamp-successor, org-element-verbatim-parser,
  org-element-verbatim-interpreter, org-element-get-property,
  org-element-get-contents, org-element-at-point,
  org-element-guess-type, org-element-collect-affiliated-keywords,
  org-element-parse-buffer, org-element-parse-secondary-string,
  org-element-map, org-element-parse-elements,
  org-element-parse-objects, org-element-get-next-object-candidates,
  org-element-interpret-data, org-element-interpret-secondary,
  org-element-normalize-string, org-element-normalize-contents,
  org-element-swap-A-B, org-element-backward,
  org-element-drag-backward, org-element-drag-forward,
  org-element-forward, org-element-mark-element,
  org-narrow-to-element, org-transpose-elements,
  org-element-unindent-buffer, org-element-up): New functions.
(org-element-paragraph-separate, org-element-all-elements,
  org-element-greater-elements, org-element-all-successors,
  org-element-object-successor-alist, org-element-recursive-objects,
  org-element-multiple-keywords, org-element-parsed-keywords,
  org-element-dual-keywords, org-element-object-restrictions,
  org-element-string-restrictions, org-element--affiliated-re,
  org-element--element-block-types): New variables.

5 years agochanging documentation to reflect changing source code -- spaces around "="
Eric Schulte [Sun, 20 Nov 2011 17:09:18 +0000 (10:09 -0700)]
changing documentation to reflect changing source code -- spaces around "="

5 years ago* doc/org.texi: Documented no spaces in name=assign, another correction to :var table
Thomas Dye [Fri, 18 Nov 2011 06:34:21 +0000 (20:34 -1000)]
* doc/org.texi: Documented no spaces in name=assign, another correction to :var table

5 years agoMerge branch 'master' of
Eric Schulte [Sun, 20 Nov 2011 16:40:52 +0000 (09:40 -0700)]
Merge branch 'master' of

5 years agoAllow spaces around "=" in code block variable specifications
Eric Schulte [Sun, 20 Nov 2011 16:40:08 +0000 (09:40 -0700)]
Allow spaces around "=" in code block variable specifications

* lisp/ob.el (org-babel-join-splits-near-ch): Rejoins a list of a
  split string when a character appears on either side of the split.
  (org-babel-parse-multiple-vars): Rejoin splits around "=" signs.

5 years agomarked test as expected to pass, because it is now passing
Eric Schulte [Sun, 20 Nov 2011 16:39:09 +0000 (09:39 -0700)]
marked test as expected to pass, because it is now passing

5 years agoAdded a less functional Org-mode copy of the cl reduce function.
Eric Schulte [Sun, 20 Nov 2011 16:38:54 +0000 (09:38 -0700)]
Added a less functional Org-mode copy of the cl reduce function.

* lisp/org.el (org-reduce): Added a less functional Org-mode copy of
  the cl reduce function.

5 years agoFontify src blocks following a "name" keyword
Nicolas Goaziou [Sun, 20 Nov 2011 09:40:25 +0000 (10:40 +0100)]
Fontify src blocks following a "name" keyword

* lisp/org.el (org-fontify-meta-lines-and-blocks-1): Recognize "name"
  as a valid keyword that can preceed a block.

5 years agodon't try to evaluate #+call lines in verbatim blocks
Eric Schulte [Fri, 18 Nov 2011 18:30:50 +0000 (11:30 -0700)]
don't try to evaluate #+call lines in verbatim blocks

* lisp/ob-exp.el (org-babel-exp-lob-one-liners): Don't limit
  in-verbatim check to inline code blocks, do lob code blocks as well.
* testing/lisp/test-ob-lob.el (test-ob-lob/do-not-eval-lob-lines-in-example-blocks-on-export):
  Test ensuring that #+call lines in verbatim blocks are not evaluated

5 years agonew testing macro for in-file execution with temp text
Eric Schulte [Fri, 18 Nov 2011 18:29:47 +0000 (11:29 -0700)]
new testing macro for in-file execution with temp text

* testing/org-test.el (org-test-with-temp-text-in-file): A new testing
  macros for temp-text tests which require a file name (e.g., for

5 years agoorg-odt.el: Rescale a large images so that it fits in text area
Jambunathan K [Thu, 17 Nov 2011 18:28:27 +0000 (23:58 +0530)]
org-odt.el: Rescale a large images so that it fits in text area

* contrib/lisp/org-odt.el (org-export-odt-max-image-size): New
(org-odt-image-size-from-file): Honor above variable.

Ivars Finvers <> says -
   One minor issue that I came across in using the ODT
exporter relates to the size of embedded images.  I often need
to include plots of simulation results in my documents.  These
plots can be larger than a normal page, which causes problems
in the text flow.  In LaTeX, I've grown used to being able to
automatically rescale a plot to match the maximum text width
of the document.  It would be useful to have such a feature
for the ODT exporter.

5 years agoMerge branch 'master' of
Carsten Dominik [Thu, 17 Nov 2011 17:06:20 +0000 (18:06 +0100)]
Merge branch 'master' of

5 years agoUse prefix arg 0 to inhibit note taking for TODO change
Carsten Dominik [Thu, 17 Nov 2011 07:56:11 +0000 (08:56 +0100)]
Use prefix arg 0 to inhibit note taking for TODO change

* lisp/org.el (org-todo): Interpret 0 prefix arg as note inhibitor.

Sometimes I want to quickly make a few TODOs done in the agenda and I
want to bypass the note taking I have normally set up.  With this
change, I can press `0 t d' in the agenda to do this.

5 years agoDon't match partial names when resolving code or data references
Eric Schulte [Wed, 16 Nov 2011 13:15:31 +0000 (06:15 -0700)]
Don't match partial names when resolving code or data references

* lisp/ob.el (org-babel-named-src-block-regexp-for-name): Ensure that
  partial names are not matched.
  (org-babel-named-data-regexp-for-name): Ensure that partial names
  are not matched.
* testing/lisp/test-ob.el (test-ob/do-not-resolve-to-partial-names-data):
  Test to ensure that partial names are not matched.

5 years agoresolve named code blocks before named data
Eric Schulte [Wed, 16 Nov 2011 03:13:41 +0000 (20:13 -0700)]
resolve named code blocks before named data

* lisp/ob-ref.el (org-babel-ref-resolve): Search for named code blocks
  before named data.
* lisp/ob.el (org-babel-named-data-regexp-for-name): New function for
  finding named data.
* testing/lisp/test-ob.el (test-ob/resolve-code-blocks-before-data-blocks):
  Test to ensure that named references are resolved in the correct

5 years agoGracefully handle results which are neither lists nor strings.
Eric Schulte [Tue, 15 Nov 2011 22:30:35 +0000 (15:30 -0700)]
Gracefully handle results which are neither lists nor strings.

* lisp/ob.el (org-babel-insert-result): Gracefully handle results
  which are neither lists nor strings.

5 years ago* doc/org.texi: Changed DATA to NAME in Working With Source Code section
Thomas Dye [Tue, 15 Nov 2011 17:49:08 +0000 (07:49 -1000)]
* doc/org.texi: Changed DATA to NAME in Working With Source Code section

5 years agoignore org-id file generated during testing
Eric Schulte [Tue, 15 Nov 2011 18:19:39 +0000 (11:19 -0700)]
ignore org-id file generated during testing

5 years agofix bug missing references to example blocks
Eric Schulte [Tue, 15 Nov 2011 18:18:26 +0000 (11:18 -0700)]
fix bug missing references to example blocks

* lisp/ob-ref.el (org-babel-ref-resolve): Don't change location when
  looking at the contents.
* testing/lisp/test-ob.el (test-ob/catches-all-references): Test
  enforcing the correct behavior.

5 years agoCreate visibility overlays properly
Milan Zamazal [Mon, 31 Oct 2011 21:40:28 +0000 (22:40 +0100)]
Create visibility overlays properly

* org.el (org-set-outline-overlay-data): Use outline-flag-region to make a
region invisible.  This ensures all necessary actions, especially adding
isearch-open-invisible property, are applied.

5 years agofix compilation warning
Eric Schulte [Tue, 15 Nov 2011 15:38:41 +0000 (08:38 -0700)]
fix compilation warning

* lisp/ob-lob.el (org-babel-in-example-or-verbatim): Fix compilation

5 years agorevert changes to interactive function `org-test-run-all-tests'
Eric Schulte [Mon, 14 Nov 2011 21:52:22 +0000 (14:52 -0700)]
revert changes to interactive function `org-test-run-all-tests'

5 years agoChanges to fix sandboxed tests to suit the standard code block syntax, and some chang...
Martyn Jago [Mon, 14 Nov 2011 21:14:50 +0000 (21:14 +0000)]
Changes to fix sandboxed tests to suit the standard code block syntax, and some changes to reduce ID testing scope and improve result gathering. * testing/org-test.el: Add org as an executable language for sand-boxed testing to suit the standard code block syntax. Use .org-test-id-locations as ID file temporarily whilst testing. Add `org-test-update-id-locations' to do just that. Clear *Messages* buffer and temporarily set `message-log-max to t to ensure capturing entire test backtrace.

* testing/.gitignore: ignore testing/.org-test-id-locations

5 years agonamed code blocks are replaced with their results
Eric Schulte [Mon, 14 Nov 2011 17:31:58 +0000 (10:31 -0700)]
named code blocks are replaced with their results

* lisp/ob.el (org-babel-find-named-result): Downcase "name" before comparison.
* testing/lisp/test-ob.el (test-ob/does-not-replace-a-block-with-the-results):
  Test that named code blocks are replaced with their results.

5 years agofix typo
Eric Schulte [Mon, 14 Nov 2011 17:24:02 +0000 (10:24 -0700)]
fix typo

* lisp/ob-lisp.el (org-babel-execute:lisp): Fixed typo.
  (org-babel-lisp-vector-to-list): Fixed typo.

5 years ago* doc/org.texi: Minor change to :var table
Tom Dye [Sat, 12 Nov 2011 18:23:39 +0000 (08:23 -1000)]
* doc/org.texi: Minor change to :var table

5 years ago* doc/org.texi: More changes to :var table (some examples were wrong)
Tom Dye [Sat, 12 Nov 2011 18:13:09 +0000 (08:13 -1000)]
* doc/org.texi: More changes to :var table (some examples were wrong)

5 years ago* doc/org.texi: Cleaned up :var table
Tom Dye [Sat, 12 Nov 2011 17:52:32 +0000 (07:52 -1000)]
* doc/org.texi: Cleaned up :var table

5 years agoIndicate tests with missing dependencies by adding a expected failing test
Eric Schulte [Sun, 13 Nov 2011 19:30:25 +0000 (12:30 -0700)]
Indicate tests with missing dependencies by adding a expected failing test

* testing/lisp/test-ob-R.el (featurep): Signal missing dependencies
  with an error rather than a throw.
* testing/org-test.el (missing-test-dependency): Define the error
  signal for missing dependencies.
  (org-test-for-executable): Signal missing dependencies with an error
  rather than a throw.
  (org-test-load): Define an expected failing test for each file with
  missing dependencies.

5 years agoFix don't load symlinks (Emacs interlocking files) * testing/org-test.el: During...
Martyn Jago [Sun, 13 Nov 2011 16:03:51 +0000 (16:03 +0000)]
Fix don't load symlinks (Emacs interlocking files) * testing/org-test.el: During test development various interlocking files may be present in testing/lisp directory (since they are being edited by emacs). Currently org-test-load will attempt to load these

5 years agoAvoid loading (and failing) symbolic links (interlocking files) * testing/org-test...
Martyn Jago [Sun, 13 Nov 2011 14:43:34 +0000 (14:43 +0000)]
Avoid loading (and failing) symbolic links (interlocking files) * testing/org-test.el: During test development various interlocking files may be present in testing/lisp directory (since they are being edited by emacs). Currently org-test-load will attempt to load these and fail.

5 years agotests protecting nested code blocks
Eric Schulte [Fri, 11 Nov 2011 21:24:23 +0000 (14:24 -0700)]
tests protecting nested code blocks

* testing/lisp/test-ob.el (test-org-babel/nested-code-block):
  Evaluation of a nested block.
  (test-org-babel/partial-nested-code-block): Evaluation of a
  partially nested block.

5 years agofixed whitespace errors in org.texi
Eric Schulte [Thu, 10 Nov 2011 17:33:31 +0000 (10:33 -0700)]
fixed whitespace errors in org.texi

5 years agodocumentation now builds successfully
Eric Schulte [Thu, 10 Nov 2011 17:32:32 +0000 (10:32 -0700)]
documentation now builds successfully

5 years agoTom's documentation updates for the new code block syntax
Eric Schulte [Thu, 10 Nov 2011 17:23:10 +0000 (10:23 -0700)]
Tom's documentation updates for the new code block syntax

5 years agopassing all tests after code block syntax changes
Eric Schulte [Thu, 10 Nov 2011 17:12:30 +0000 (10:12 -0700)]
passing all tests after code block syntax changes

* lisp/ob-exp.el (org-babel-in-example-or-verbatim): Some valid
  execution contexts (e.g., call lines) look like commented lines.
* lisp/ob.el (org-babel-get-src-block-info): Empty match string
  doesn't count.
  (org-babel-process-params): Always process parameters, even if you
  don't to table splitting.
* testing/lisp/test-ob-C.el (ob-C/table): Ignore failures for this C
* testing/lisp/test-ob-fortran.el (ob-fortran/input-var): Ignore
  failures for this fortran test.

5 years agoproperty names ending in plus accumulate
Eric Schulte [Mon, 7 Nov 2011 21:49:42 +0000 (14:49 -0700)]
property names ending in plus accumulate

This results in the following behavior.

  #+property: var  foo=1
  #+property: var+ bar=2

  #+begin_src emacs-lisp
    (+ foo bar)

  : 3

  #+begin_src emacs-lisp
    (org-entry-get (point) "var" t)

  : foo=1 bar=2

  * overwriting a file-wide property
    :var:      foo=7

  #+begin_src emacs-lisp

  : 7

  #+begin_src emacs-lisp
    (org-entry-get (point) "var" t)

  : foo=7

  * appending to a file-wide property
    :var+:      baz=3

  #+begin_src emacs-lisp
    (+ foo bar baz)

  : 6

  #+begin_src emacs-lisp
    (org-entry-get (point) "var" t)

  : foo=1 bar=2 baz=3

* lisp/org.el (org-update-property-plist): Updates a given property
  list with a property name and a property value.
  (org-set-regexps-and-options): Use org-update-property-plist.
  (org-entry-get): Use org-update-property-plist.
* testing/examples/ Example file for testing
  appending property behavior.
* testing/lisp/test-property-inheritance.el: Tests of appending
  property behavior.
* lisp/ob.el (org-babel-balanced-split): Allow splitting on single
  characters as well as groups of two characters.
  (org-babel-parse-multiple-vars): Split variables on single spaces.

5 years agoStandardized code block keywords
Eric Schulte [Fri, 28 Oct 2011 23:52:48 +0000 (23:52 +0000)]
Standardized code block keywords

Nick Dokos <> writes:

> Eric Schulte <> wrote:
>> The attached updated patch fixes a bug in the original.
> Minor problem in applying:
> ,----
> | $ git apply ~/Mail/inbox/724
> | /home/nick/Mail/inbox/724:671: trailing whitespace.
> | #+name:
> | /home/nick/Mail/inbox/724:599: new blank line at EOF.
> | +
> | warning: 2 lines add whitespace errors.
> `----

The attached version fixes these issues, Thanks -- Eric

>From 0e43d59ee8d46a63f86780a502de726271bc39de Mon Sep 17 00:00:00 2001
From: Eric Schulte <>
Date: Fri, 28 Oct 2011 10:44:21 -0600
Subject: [PATCH] removing code block, results and call-line synonyms -- BREAKING CHANGE

Following a round of on-list discussion many code block synonyms have
been removed, moving forward the following syntax is valid.

- call lines are specified with #+call:
- code blocks are named with #+name:
- results are named with #+name:, however results generated by a code
  block may still be labeled with #+results:, and tables named with
  #+tblname: will be considered to be named results

The following function may be used to update an existing Org-mode
buffer to the new syntax.

  (defun update-org-buffer ()
    "Update an Org-mode buffer to the new data, code block and call line syntax."
      (flet ((to-re (lst) (concat "^[ \t]*#\\+" (regexp-opt lst t)
                                  "\\(\\[\\([[:alnum:]]+\\)\\]\\)?\\:[ \t]*"))
             (update (re new)
                     (goto-char (point-min))
                     (while (re-search-forward re nil t)
                       (replace-match new nil nil nil 1))))
        (let ((old-re (to-re '("RESULTS" "DATA" "SRCNAME" "SOURCE")))
              (lob-re (to-re '("LOB")))
              (case-fold-search t))
          (update old-re "name")
          (update lob-re "call")))))

Note: If an old version of Org-mode (e.g., the one shipped with Emacs)
      is installed on your system many of the important variables will
      be pre-defined with a defvar and *will not* have their values
      automatically updated, these include the following.
      - org-babel-data-names
      - org-babel-result-regexp
      - org-babel-src-block-regexp
      - org-babel-src-name-regexp
      - org-babel-src-name-w-name-regexp
      It may be necessary to either remove the source code of older
      versions of Org-mode, or to explicitly evaluate the ob.el file.

* lisp/ob-exp.el (org-exp-res/src-name-cleanup): Updated
* lisp/ob-lob.el (org-babel-block-lob-one-liner-regexp): Updated
  regular expression.
  (org-babel-inline-lob-one-liner-regexp): Updated regular expression.
* lisp/ob-ref.el (org-babel-ref-resolve): Notice when something that
  looks like a data results may actually be a code block.
* lisp/ob-table.el: Updated documentation.
* lisp/ob.el (org-babel-src-name-regexp): Simplified regexp.
  (org-babel-get-src-block-info): Updated match strings.
  (org-babel-data-names): Simplified acceptable names.
  (org-babel-find-named-block): Indentation.
  (org-babel-find-named-result): Updated to not return a code block as
  a result.
* lisp/org.el (org-fontify-meta-lines-and-blocks-1): Removing
  references to old syntactic elements.
  (org-additional-option-like-keywords): Removing references to old
  syntactic elements.
* contrib/babel/ Updated to make use of the new
* testing/examples/ Updated to make use of the new
* testing/examples/ Updated to make use of the new syntax.
* testing/examples/ Updated to make use of the new
* testing/examples/ Updated to make use of the new
* testing/lisp/test-ob.el: Removed two bad tests which tested the
  literal values of old regular expressions rather than their

5 years agoFix function call order in previous patch
Carsten Dominik [Mon, 14 Nov 2011 07:35:12 +0000 (08:35 +0100)]
Fix function call order in previous patch

* lisp/org-agenda.el (org-agenda-get-todos): Swap calls to `org-trim' and

5 years agoorg-agenda: Do not break TODO list view with empty tasks
Nicolas Goaziou [Sun, 13 Nov 2011 23:36:23 +0000 (00:36 +0100)]
org-agenda: Do not break TODO list view with empty tasks

* lisp/org-agenda.el (org-agenda-get-todos): Prevent an error when
  encountering tasks with only the TODO keyword.

5 years agoorg-xhtml.el: Merge commit 2f50b1
Jambunathan K [Sun, 13 Nov 2011 20:19:15 +0000 (01:49 +0530)]
org-xhtml.el: Merge commit 2f50b1

5 years agoorg-xhtml.el: Bring over few commits (contd.)
Jambunathan K [Sun, 13 Nov 2011 19:29:17 +0000 (00:59 +0530)]
org-xhtml.el: Bring over few commits (contd.)

Bring over following commits:

5 years agoorg-lparse.el & co: Bring over few commits (contd.)
Jambunathan K [Sun, 13 Nov 2011 08:46:42 +0000 (14:16 +0530)]
org-lparse.el & co: Bring over few commits (contd.)

Bring over following commits:

5 years agoAllow cdlatex expansions at a list item or an headline
Nicolas Goaziou [Sat, 12 Nov 2011 14:04:19 +0000 (15:04 +0100)]
Allow cdlatex expansions at a list item or an headline

* lisp/org.el (org-try-cdlatex-tab): Don't try to expand a LaTeX
environment when at an item or an headline, but allow LaTeX
(org-cycle): Try to call `cdlatex-tab' before cycling item's or
headline's visibility, in order to catch LaTeX fragments within.

This patch is based on the report and work of Maik Beckmann.

5 years agoorg-lparse.el & co: Bring over few commits
Jambunathan K [Sun, 13 Nov 2011 06:15:24 +0000 (11:45 +0530)]
org-lparse.el & co: Bring over few commits

Bring over following commits:

5 years agoorg-lparse.el: Fix issues with formatting of custom links
Jambunathan K [Sat, 12 Nov 2011 21:03:35 +0000 (02:33 +0530)]
org-lparse.el: Fix issues with formatting of custom links

* contrib/lisp/org-lparse.el (org-lparse-format-org-link): Fix
issues with formatting of custom links - pass the right
backend to the custom formatter.

Fix for bug reported by Christian Moe here:

TODO: Modify `org-bbdb-export' to support odt backend.  Review contrib
modules for odt compatibility.

5 years agoorg-xhtml.el: Minor fix
Jambunathan K [Sat, 12 Nov 2011 20:54:44 +0000 (02:24 +0530)]
org-xhtml.el: Minor fix

* contrib/lisp/org-xhtml.el (org-xhtml-begin-environment)
(org-xhtml-end-environment): Fix param list.

Continue commit 2e0e462d1460f4a4e55e180a4f090c5db7ca63af.

Support for annotation blocks for xhtml backend still needs to
be ported.  See org-exp-blocks.el for more information.

5 years agoRequire a newline and spaces before a code block.
Eric Schulte [Fri, 11 Nov 2011 21:17:19 +0000 (14:17 -0700)]
Require a newline and spaces before a code block.

* lisp/org-exp-blocks.el (org-export-blocks-preprocess): Require a
  newline and spaces before a code block.

5 years agoexecute call lines when executing an entire buffer
Eric Schulte [Wed, 9 Nov 2011 21:35:04 +0000 (14:35 -0700)]
execute call lines when executing an entire buffer

* lisp/ob-lob.el (org-babel-map-call-lines): Allow mapping of code
  over all call lines in a buffer.
* lisp/ob.el (org-babel-execute-buffer): Execute call lines when
  executing an entire buffer.

5 years agodon't disassemble tables twice on export
Eric Schulte [Wed, 9 Nov 2011 21:11:24 +0000 (14:11 -0700)]
don't disassemble tables twice on export

* lisp/ob.el (org-babel-process-params): Don't disassemble tables

5 years agoorg.texi: Clarify documentation regarding TODO state change logging.
Jason Dunsmore [Wed, 9 Nov 2011 20:06:09 +0000 (14:06 -0600)]
org.texi: Clarify documentation regarding TODO state change logging.

5 years agoMerge branch 'timestamps-without-dayname'
Carsten Dominik [Wed, 9 Nov 2011 18:18:02 +0000 (19:18 +0100)]
Merge branch 'timestamps-without-dayname'

5 years agoAllow time stampes without day name
Carsten Dominik [Thu, 13 Oct 2011 09:42:45 +0000 (11:42 +0200)]
Allow time stampes without day name

* lisp/org-clock.el (org-clock-in):
(org-clock-find-position): Make space after date optional.
* lisp/org.el (org-set-regexps-and-options):
(org-ctrl-c-ctrl-c): Make `C-c C-c' on date fix the time stamp

* doc/org.texi (Creating timestamps): Document the effect of `C-c C-c'
on a timestamp.

5 years agocall lines are more careful about being in example or verbatim blocks
Eric Schulte [Wed, 9 Nov 2011 02:42:59 +0000 (19:42 -0700)]
call lines are more careful about being in example or verbatim blocks

* lisp/ob-lob.el (org-babel-lob-execute-maybe): Don't execute a call
  inside a verbatim block.
* lisp/ob-exp.el (org-babel-in-example-or-verbatim): Check for example

5 years agofix whitespace errors
Eric Schulte [Tue, 8 Nov 2011 20:52:11 +0000 (13:52 -0700)]
fix whitespace errors

5 years agoconstruct a table from the output of maxima code block
Litvinov Sergey [Sun, 2 Oct 2011 01:37:14 +0000 (01:37 +0000)]
construct a table from the output of maxima code block

Please consider a patch to construct a table from the output of maxima
code block.

>From a0305117f4e793c93d7d10bc7aab04f96bd62e9c Mon Sep 17 00:00:00 2001
From: Litvinov Sergey <>
Date: Sat, 1 Oct 2011 22:29:18 +0200
Subject: [PATCH] [ob-maxima] Construct a table from the output of the code block. Add
 ert tests.

5 years agofix whitespace errors
Eric Schulte [Tue, 8 Nov 2011 20:44:23 +0000 (13:44 -0700)]
fix whitespace errors

5 years agocpp->c++-mode, ob-C mode tests
Litvinov Sergey [Thu, 4 Aug 2011 01:08:56 +0000 (01:08 +0000)]
cpp->c++-mode, ob-C mode tests

The first patch maps cpp language code to c++-mode. The second patch
adds tests for ob-C.

>From fba6eef6944766e675e4abe1d11d347b9a728031 Mon Sep 17 00:00:00 2001
From: Sergey Litvinov <>
Date: Wed, 3 Aug 2011 22:03:19 +0200
Subject: [PATCH 2/2] Add tests for ob-C.el