4 years agoMerge branch 'maint'
Nicolas Goaziou [Wed, 6 Nov 2013 15:12:57 +0000 (16:12 +0100)]
Merge branch 'maint'

4 years agoox-html: Add TODO keyword to TOC entries
Nicolas Goaziou [Wed, 6 Nov 2013 14:26:53 +0000 (15:26 +0100)]
ox-html: Add TODO keyword to TOC entries

* lisp/ox-html.el (org-html--format-toc-headline): TOC entries are
  closer to regular headline formatting.

4 years agoMerge branch 'maint'
Bastien Guerry [Wed, 6 Nov 2013 14:52:15 +0000 (15:52 +0100)]
Merge branch 'maint'

4 years agoorg-capture: Fix bug when capturing with templates using `function'
Bastien Guerry [Wed, 6 Nov 2013 14:51:57 +0000 (15:51 +0100)]
org-capture: Fix bug when capturing with templates using `function'

* org-capture.el (org-capture): Store :return-to-wconf
(org-capture-place-template): Don't store :return-to-wconf
when called from a capture template using `function', rely on
the early :return-to-wconf value store from `org-capture'.

Thanks to Brett Viren for raising this issue.

4 years agoMerge branch 'maint'
Bastien Guerry [Wed, 6 Nov 2013 09:02:18 +0000 (10:02 +0100)]
Merge branch 'maint'

4 years agoorg-agenda: Fix bug when showing the new time
Bastien Guerry [Wed, 6 Nov 2013 08:59:46 +0000 (09:59 +0100)]
org-agenda: Fix bug when showing the new time

* org-agenda.el (org-agenda-show-new-time): Ignore invisible
text when inserting the new time as a text property.

* org-compat.el (org-move-to-column): New argument
`ignore-invisible' to turn on `buffer-invisibility-spec'.

Thanks to Marcin Borkowski and Karl Voit for reporting this.

4 years agoMerge branch 'maint'
Bastien Guerry [Tue, 5 Nov 2013 20:54:37 +0000 (21:54 +0100)]
Merge branch 'maint'

4 years agoorg.el (org-insert-link): Don't remove brackets when they belong to a timestamp in...
Bastien Guerry [Tue, 5 Nov 2013 20:54:12 +0000 (21:54 +0100)]
org.el (org-insert-link): Don't remove brackets when they belong to a timestamp in a headline

* org.el (org-insert-link): Don't remove brackets when they
belong to a timestamp in a headline.

Thanks to David Belohrad for spotting this.

4 years agoorg-footnote: Fix void `org-element-cache-reset' symbol error
Nicolas Goaziou [Tue, 5 Nov 2013 19:47:29 +0000 (20:47 +0100)]
org-footnote: Fix void `org-element-cache-reset' symbol error

* lisp/org-footnote.el (org-footnote-section): Fix void
  `org-element-cache-reset' symbol error.

4 years agoMerge branch 'maint'
Bastien Guerry [Tue, 5 Nov 2013 18:42:24 +0000 (19:42 +0100)]
Merge branch 'maint'

4 years agoorg-agenda.el (org-agenda-filter-make-matcher): Fix regression
Bastien Guerry [Tue, 5 Nov 2013 18:41:41 +0000 (19:41 +0100)]
org-agenda.el (org-agenda-filter-make-matcher): Fix regression

* org-agenda.el (org-agenda-filter-make-matcher): When
filtering tags and hitting space, filter out entries with
tags, only keep those without tags.

Thanks to Serguei Son for reporting this regression.

4 years agoorg.el (org-use-speed-commands): Enhance docstring
Oleh [Tue, 5 Nov 2013 18:14:55 +0000 (19:14 +0100)]
org.el (org-use-speed-commands): Enhance docstring

* org.el (org-use-speed-commands): Enhance docstring.


4 years agoMerge branch 'maint'
Bastien Guerry [Tue, 5 Nov 2013 16:27:10 +0000 (17:27 +0100)]
Merge branch 'maint'

4 years agoox-odt.el (org-odt-table-style-format): Use %s for inserting the rel-width property...
Bastien Guerry [Tue, 5 Nov 2013 16:26:46 +0000 (17:26 +0100)]
ox-odt.el (org-odt-table-style-format): Use %s for inserting the rel-width property as a string

* ox-odt.el (org-odt-table-style-format): Use %s for inserting
the rel-width property as a string.
(org-odt-template): Fall back on a string for :rel-width.

Thanks to Derek Feichtinger for reporting this bug.

4 years agoMerge branch 'maint'
Bastien Guerry [Tue, 5 Nov 2013 11:14:25 +0000 (12:14 +0100)]
Merge branch 'maint'

4 years agoSome clean-up related to org-remember being removed
Bastien Guerry [Tue, 5 Nov 2013 11:13:46 +0000 (12:13 +0100)]
Some clean-up related to org-remember being removed

* org.el (org-directory, org-default-notes-file)
(org-reverse-note-order): Don't use the `org-remember'
customization group.
(org-require-autoloaded-modules): Don't require

* org-capture.el: Update commentary section to reflect the
fact that org-remember.el is not used anymore.

4 years agoorg-table.el (org-table-recalculate): Generate user error if an hline relative refere...
Rick Frankel [Tue, 5 Nov 2013 11:07:41 +0000 (12:07 +0100)]
org-table.el (org-table-recalculate): Generate user error if an hline relative reference is use on the LHS of a formula

* org-table.el (org-table-recalculate): Generate user error if
an hline relative reference is use on the LHS of a formula.


4 years agoMerge branch 'maint'
Bastien Guerry [Mon, 4 Nov 2013 23:14:12 +0000 (00:14 +0100)]
Merge branch 'maint'

4 years agocontrib/lisp/ox-rss.el: Enhance RFC822 formatting string
Bastien Guerry [Mon, 4 Nov 2013 23:14:03 +0000 (00:14 +0100)]
contrib/lisp/ox-rss.el: Enhance RFC822 formatting string

* contrib/lisp/ox-rss.el (org-rss-headline)
(org-rss-build-channel-info): Use %b instead of %h for RFC822

Thanks to Andrea Rossetti for reporting this.

4 years agoorg.el (org-open-file): Reveal context around point
Bastien Guerry [Mon, 4 Nov 2013 23:05:33 +0000 (00:05 +0100)]
org.el (org-open-file): Reveal context around point

* org.el (org-open-file): Reveal context around point when
opening a link to an Org file with a line number.

Thanks to François Pinard for suggesting this.

4 years agoMerge branch 'maint'
Bastien Guerry [Mon, 4 Nov 2013 22:36:32 +0000 (23:36 +0100)]
Merge branch 'maint'

4 years agoorg-agenda.el (org-agenda-drag-line-forward): Fix bugs
Bastien Guerry [Mon, 4 Nov 2013 22:36:18 +0000 (23:36 +0100)]
org-agenda.el (org-agenda-drag-line-forward): Fix bugs

* org-agenda.el (org-agenda-drag-line-forward)
(org-agenda-drag-line-backward): Fix bugs: don't drag lines
without text and don't drag lines before/after hidden lines.

Thanks to Thomas Morgan for reporting bugs in this area.

4 years agoorg-element: Fix bug in cache
Nicolas Goaziou [Mon, 4 Nov 2013 18:28:07 +0000 (19:28 +0100)]
org-element: Fix bug in cache

* lisp/org-element.el (org-element--cache-sync): Modifying blank lines
  at the end of a list or a footnote definition no longer corrupt

4 years agoorg-element: Small refactoring
Nicolas Goaziou [Mon, 4 Nov 2013 17:16:28 +0000 (18:16 +0100)]
org-element: Small refactoring

* lisp/org-element.el (org-element-item-parser,
  org-element-plain-list-parser): Remove dependencies on org-list

4 years agoSmall refactoring in comment functions
Nicolas Goaziou [Mon, 4 Nov 2013 17:00:40 +0000 (18:00 +0100)]
Small refactoring in comment functions

* lisp/org.el (org-insert-comment, org-comment-or-uncomment-region):
  Use `org-element-at-point' instead of `org-in-src-block-p' to check
  if we're within a source block.
* testing/lisp/test-org.el: Add test.

4 years agolisp/org.el (org-set-tags): Calculate width of tags with string-width
Yasushi SHOJI [Sat, 12 Oct 2013 11:10:06 +0000 (20:10 +0900)]
lisp/org.el (org-set-tags): Calculate width of tags with string-width

* lisp/org.el (org-set-tags): Width of strings presenting on a buffer
should be calculated with `string-width' instead of `length'.

This fixes unaligned tags for the languages with multi-width


4 years agoorg.el (org-sort-entries): Enhance the docstring
Bastien Guerry [Mon, 4 Nov 2013 11:52:01 +0000 (12:52 +0100)]
org.el (org-sort-entries): Enhance the docstring

* org.el (org-sort-entries): Mention the
`org-after-sorting-entries-or-items-hook' hook in the

Thanks to Andreas Röhler for suggesting this.

4 years agoMerge branch 'maint'
Bastien Guerry [Mon, 4 Nov 2013 11:45:44 +0000 (12:45 +0100)]
Merge branch 'maint'

4 years agoorg.texi (Catching invisible edits): Fix typo
Bastien Guerry [Mon, 4 Nov 2013 11:45:22 +0000 (12:45 +0100)]
org.texi (Catching invisible edits): Fix typo

* org.texi (Catching invisible edits): Fix typo.

Thanks to Cyprien Gay for reporting this.

4 years agomake comment-dwim in source code blocks more DWIM-ish
Aaron Ecay [Mon, 28 Oct 2013 21:40:37 +0000 (17:40 -0400)]
make comment-dwim in source code blocks more DWIM-ish

* lisp/org.el (org-insert-comment, org-comment-or-uncomment-region):
use the relevant language’s major mode comment function if called from
within a source block.

This patch makes it easier to (un)comment lines of babel source.  Now
M-; in a soucre code block should Just Work.

The modification to ‘org-insert-comment’ also fixes a bug, whereby the
function would eat blank lines after it.  The first block, where ! is
the point, would lead to the second instead of the third:

 #+name: orig
 #+begin_src org


 #+name: bad
 #+begin_src org

 #+name: desired
 #+begin_src org


Also, the ‘org-comment-or-uncomment-region’ change results in an
undesirably move of the point after the comment is created.  This is
because ‘comment-region’ wraps the call to ‘comment-region-function’
in a ‘save-excursion’.  The org mode code deletes and reinserts the
whole babel block, which confuses save-excursion.  Org carefully puts
the point back in the proper place, but comment-region’s
save-excursion then substitutes its own erroneous placement.

4 years agoMerge branch 'maint'
Bastien Guerry [Mon, 4 Nov 2013 11:20:20 +0000 (12:20 +0100)]
Merge branch 'maint'

4 years agoorg.el (org-babel-load-file): Set `exported-file' correctly
Bastien Guerry [Mon, 4 Nov 2013 11:19:45 +0000 (12:19 +0100)]
org.el (org-babel-load-file): Set `exported-file' correctly

* org.el (org-babel-load-file): Set `exported-file' correctly,
in case the file as been tangled using a buffer-local value.

* ob-tangle.el (org-babel-tangle-file): Return the list of
tangled files.

Thanks to Sam Flint for reporting this.

4 years agoRename org-favtable.el to org-index.el
Bastien Guerry [Mon, 4 Nov 2013 10:54:40 +0000 (11:54 +0100)]
Rename org-favtable.el to org-index.el

As requested by Marc Ihm.

4 years agoob-clojure.el: Add support for the cider backend
Bastien Guerry [Mon, 4 Nov 2013 10:30:34 +0000 (11:30 +0100)]
ob-clojure.el: Add support for the cider backend

* ob-clojure.el (org-babel-clojure-backend): Add customization
(org-babel-execute:clojure): Add support for cider.

4 years agoMerge branch 'master' of
Bastien Guerry [Sun, 3 Nov 2013 21:08:03 +0000 (22:08 +0100)]
Merge branch 'master' of

4 years agoMerge branch 'maint'
Nicolas Goaziou [Sun, 3 Nov 2013 16:53:11 +0000 (17:53 +0100)]
Merge branch 'maint'

4 years agoorg-element: Fix error when parsing lowercase keywords
Nicolas Goaziou [Sun, 3 Nov 2013 16:47:55 +0000 (17:47 +0100)]
org-element: Fix error when parsing lowercase keywords

* lisp/org-element.el (org-element-context): Fix error when parsing
  affiliated keywords, e.g. "caption".
* testing/lisp/test-org-element.el: Add test.

4 years agoMerge branch 'maint'
Nicolas Goaziou [Sun, 3 Nov 2013 13:19:54 +0000 (14:19 +0100)]
Merge branch 'maint'

4 years agoFix flyspell behaviour on verbatim objects
Nicolas Goaziou [Sun, 3 Nov 2013 13:18:19 +0000 (14:18 +0100)]
Fix flyspell behaviour on verbatim objects

* lisp/org.el (org-do-emphasis-faces): Look for verbatim status at
  correct location.

4 years agoMerge branch 'master' of
Bastien Guerry [Sun, 3 Nov 2013 13:10:05 +0000 (14:10 +0100)]
Merge branch 'master' of

4 years agoorg-element: Implement caching for dynamic parser
Nicolas Goaziou [Sun, 27 Oct 2013 10:09:17 +0000 (11:09 +0100)]
org-element: Implement caching for dynamic parser

* lisp/org-element.el (org-element-use-cache, org-element--cache,
org-element--cache-merge-changes-threshold, org-element--cache-status,
org-element--cache-opening-line, org-element--cache-closing-line): New
(org-element-cache-reset, org-element--cache-pending-changes-p,
org-element--cache-push-change, org-element--cache-cancel-changes,
org-element--cache-get-key, org-element-cache-get,
org-element-cache-put, org-element--shift-positions,
org-element--cache-before-change, org-element--cache-record-change,
org-element--cache-sync): New functions.
(org-element-at-point, org-element-context): Use cache when possible.
* lisp/org.el (org-mode, org-set-modules): Reset cache.
* lisp/org-footnote.el (org-footnote-section): Reset cache.
* testing/lisp/test-org-element.el: Update tests.

This patch gives a boost to `org-element-at-point' and, to a lesser
extent, to `org-element-context'.

4 years agoMerge branch 'maint'
Nicolas Goaziou [Sun, 3 Nov 2013 12:08:44 +0000 (13:08 +0100)]
Merge branch 'maint'

4 years agoFix wrong-type-argument error when opening id link
Nicolas Goaziou [Sun, 3 Nov 2013 12:06:14 +0000 (13:06 +0100)]
Fix wrong-type-argument error when opening id link

* lisp/org.el (org-open-at-point): Check if link is non-nil before
  matching it.

Reported-by: Daniel Clemente <>
4 years agoMerge branch 'master' of
Bastien Guerry [Sun, 3 Nov 2013 11:17:45 +0000 (12:17 +0100)]
Merge branch 'master' of

4 years agoMerge branch 'maint'
Nicolas Goaziou [Sun, 3 Nov 2013 10:38:28 +0000 (11:38 +0100)]
Merge branch 'maint'

4 years agoox: Fix OPTIONS in default template
Nicolas Goaziou [Sun, 3 Nov 2013 10:35:31 +0000 (11:35 +0100)]
ox: Fix OPTIONS in default template

* lisp/ox.el (org-export-insert-default-template): Make sure strings
  are properly quoted when inserting a template.  Specifically,
  default value for drawers should be d:(not "LOGBOOK"), not d:(not

4 years agoMerge branch 'master' of
Bastien Guerry [Sun, 3 Nov 2013 10:23:03 +0000 (11:23 +0100)]
Merge branch 'master' of

4 years agoFix small bug
Nicolas Goaziou [Sat, 2 Nov 2013 16:41:30 +0000 (17:41 +0100)]
Fix small bug

* lisp/org.el (org-display-inline-images): Fix bug introduced in

4 years agoPrevent flagging drawers in example blocks
Nicolas Goaziou [Sat, 2 Nov 2013 14:48:36 +0000 (15:48 +0100)]
Prevent flagging drawers in example blocks

* lisp/org.el (org-flag-drawer): Rewrite function using Elements.
  Also prevents flagging drawers within example blocks.
* testing/lisp/test-org.el (test-org/flag-drawer): Add test.

4 years agoox: Add :input-buffer to communication channel
Nicolas Goaziou [Sat, 2 Nov 2013 13:33:24 +0000 (14:33 +0100)]
ox: Add :input-buffer to communication channel

* lisp/ox.el (org-export--get-buffer-attributes): Add :input-buffer

4 years agoox: Fix comment
Nicolas Goaziou [Sat, 2 Nov 2013 13:32:07 +0000 (14:32 +0100)]
ox: Fix comment

4 years agoFix inline images display
Nicolas Goaziou [Sat, 2 Nov 2013 13:23:41 +0000 (14:23 +0100)]
Fix inline images display

* lisp/org.el (org-display-inline-images): Rewrite function.

4 years agoorg.el: Display images in link descriptions.
Rick Frankel [Thu, 31 Oct 2013 21:06:49 +0000 (17:06 -0400)]
org.el: Display images in link descriptions.

* lisp/org.el (org-display-inline-images): Modify link regular
  expression to match images in description part. Update doc string to
  explain link behavior.

4 years agoorg.texi: Remove references to DRAWERS keyword
Nicolas Goaziou [Thu, 31 Oct 2013 20:27:18 +0000 (21:27 +0100)]
org.texi: Remove references to DRAWERS keyword

* doc/org.texi (Drawers, RSS feeds, In-buffer settings): Remove
  references to DRAWERS keyword, which is unused now.

4 years agoRemove need to declare drawers before using them
Nicolas Goaziou [Sun, 20 Oct 2013 12:40:09 +0000 (14:40 +0200)]
Remove need to declare drawers before using them

* lisp/org-agenda.el (org-agenda-prepare): Remove reference to
(org-agenda-show-1): Remove reference to `org-drawers'.
* lisp/org-clock.el (org-clock-remove-empty-clock-drawer,
  org-clock-cancel): Apply signature change to
* lisp/org-element.el (org-element--list-struct): Use
  `org-drawer-regexp' instead of `org-drawers'.
* lisp/org-feed.el (org-feed-drawer): Update docstring according to
* lisp/org-list.el (org-in-item-p, org-list-context): Use
  `org-drawer-regexp' instead of `org-drawers'.
* lisp/org-mobile.el (org-mobile-create-index-file): Remove reference
  to `org-drawers-for-agenda'.
* lisp/org-pcomplete.el (pcomplete/org-mode/drawer): Remove function.
* lisp/org.el (org-drawer-regexp): Make variable global.
(org-drawers): Remove variable.
(org-set-regexps-and-options): Ignore DRAWER keyword.
(org-cycle): Use `org-drawer-regexp' instead of `org-drawers'.
(org-cycle-hide-drawers): Add an optional argument to ignore some
(org-remove-empty-drawer-at): Remove second argument.  Rewrite
(org-clone-subtree-with-time-shift): Apply signature change to
(org-toggle-ordered-property): Apply `org-delete-property' signature
(org-map-entries): Remove reference to `org-drawers-for-agenda'.
(org-entry-delete): Remove optional argument.  Small refactoring.
(org-insert-drawer): Remove reference to `org-drawers'.
(org-delete-property): Apply `org-entry-delete' signature change.
(org-in-drawer-p): Rewrite function.
* testing/lisp/test-org-element.el: Update tests.
* testing/lisp/test-org.el: Update tests.
* testing/lisp/test-ox.el: Update tests.

4 years agoox: Change default asynchronous export setup
Nicolas Goaziou [Mon, 28 Oct 2013 17:56:04 +0000 (18:56 +0100)]
ox: Change default asynchronous export setup

* lisp/ox.el (org-export-async-init-file): Change default value and
  allowed values.
(org-export-async-start): Apply change to the variable.

4 years agobabel: don’t move point when tangling a single block
Aaron Ecay [Thu, 31 Oct 2013 05:47:44 +0000 (01:47 -0400)]
babel: don’t move point when tangling a single block

* lisp/ob-tangle.el: (org-babel-tangle): don’t move point when called
with single prefix arg

Previously, C-u C-x C-v C-t would move point to the head of the source block.

4 years agoox: fix some docstrings
Aaron Ecay [Thu, 31 Oct 2013 03:03:10 +0000 (23:03 -0400)]
ox: fix some docstrings

* lisp/ox.el (org-export-table-cell-starts-colgroup-p,
org-export-table-row-ends-rowgroup-p): fix swapage of "row" and
"column" in the docstrings for these functions

4 years agolisp/ob-C.el (org-babel-C-execute): turn on inhibit-lisp eval
Oleh Krehel [Wed, 30 Oct 2013 07:50:33 +0000 (08:50 +0100)]
lisp/ob-C.el (org-babel-C-execute): turn on inhibit-lisp eval

4 years agofix compiler issues w/safe-header-args
Eric Schulte [Wed, 30 Oct 2013 17:58:50 +0000 (11:58 -0600)]
fix compiler issues w/safe-header-args

* lisp/ob-core.el (org-every): Declared function for compiler.
  (org-babel-safe-header-args): Moved before first use.
  (org-babel-header-args-safe-fn): Moved before first use.

4 years agomark o-b-default-header-args:R as a safe local under proper conditions
Aaron Ecay [Mon, 28 Oct 2013 19:40:32 +0000 (15:40 -0400)]
mark o-b-default-header-args:R as a safe local under proper conditions

* lisp/ob-R.el (org-babel-default-header-args:R): mark as a safe local

4 years agoMark some org-babel variables as safe locals under proper conditions
Aaron Ecay [Mon, 28 Oct 2013 19:39:31 +0000 (15:39 -0400)]
Mark some org-babel variables as safe locals under proper conditions

* lisp/ob-core.el (org-babel-inline-result-wrap,
org-babel-default-inline-header-args): mark as safe local variables

4 years agoox: Table continuation strings for some languages
Thomas Dye [Wed, 30 Oct 2013 00:39:48 +0000 (14:39 -1000)]
ox: Table continuation strings for some languages

* lisp/ox.el (org-export-dictionary): Add table continuation strings
  for some languages.

4 years agoob-comint: Silence byte compiler
Nicolas Goaziou [Wed, 30 Oct 2013 08:40:40 +0000 (09:40 +0100)]
ob-comint: Silence byte compiler

* lisp/ob-comint.el (org-babel-comint-with-output): Fix code typo.

4 years agoox-latex: Mark some variables safe locals
Aaron Ecay [Mon, 28 Oct 2013 20:19:01 +0000 (16:19 -0400)]
ox-latex: Mark some variables safe locals

* lisp/ox-latex.el (org-latex-with-hyperref,
org-latex-default-table-mode, org-latex-tables-booktabs,
org-latex-tables-centered, org-latex-table-caption-above,
org-latex-listings): add safe local variable properties

4 years agobabel: don’t add babel eval to the session’s comint input ring
Aaron Ecay [Mon, 28 Oct 2013 22:58:52 +0000 (18:58 -0400)]
babel: don’t add babel eval to the session’s comint input ring

* lisp/ob-comint.el (org-babel-comint-in-buffer): don’t add to

Previously, babel code would be added to the comint input ring of a
babel session, making interactive use of the session difficult: one
had to page through the babel generated commands when browsing the
comint history with M-p/M-n.  The session repl’s history should just
contain commands the user has specifically entered in the repl buffer,
and not those which are fed in from org mode.  So, we bind
‘comint-input-filter’ to a function that always returns nil in the
‘org-babel-comint-in-buffer’ macro, to avoid any additions to the
input ring while executing code from babel.

4 years agoclean up two macros in ob-comint
Aaron Ecay [Mon, 28 Oct 2013 22:58:44 +0000 (18:58 -0400)]
clean up two macros in ob-comint

* lisp/ob-comint.el (org-babel-comint-with-output,
org-babel-comint-in-buffer): clean up code.

This patch replaces some deeply nested ca/dr calls with ‘nth’, and
replaces a setq/unwind-protect/setq incantation with a simple let
binding.  Finally, it also restructures ’org-babel-comint-in-buffer’
to not needlessly save/restore match and excursion data if the buffer
process is not live, and to use with-current-buffer instead of
(info "(elisp) Excursions")

4 years agoMerge branch 'maint'
Nicolas Goaziou [Tue, 29 Oct 2013 23:34:46 +0000 (00:34 +0100)]
Merge branch 'maint'

4 years agoorg-inlinetask: fix inlinetask unfolding
Jonas Hoersch [Tue, 29 Oct 2013 16:07:49 +0000 (17:07 +0100)]
org-inlinetask: fix inlinetask unfolding

* lisp/org-inlinetask.el (org-inlinetask-toggle-visibility): Don't use
  `org-show-entry` as it cannot unfold an inlinetask properly.


4 years agoMerge branch 'maint'
Nicolas Goaziou [Tue, 29 Oct 2013 19:47:42 +0000 (20:47 +0100)]
Merge branch 'maint'

4 years agoox-latex: Don't quote const in defcustom
Rüdiger Sonderfeld [Tue, 29 Oct 2013 16:20:20 +0000 (17:20 +0100)]
ox-latex: Don't quote const in defcustom

* lisp/ox-latex.el (org-latex-listings): Don't quote const value.

Quoting it would set `org-export-latex' not to `minted' but `(quote
minted)' and thus breaking the export.

Signed-off-by: Rüdiger Sonderfeld <>
4 years agoox-latex: Change to longtable strings
Nicolas Goaziou [Tue, 29 Oct 2013 14:31:22 +0000 (15:31 +0100)]
ox-latex: Change to longtable strings

* lisp/ox-latex.el (org-latex--translate): New function.
org-latex-longtable-continued-from): Remove variables.
(org-latex-table-row): Use new function.
* lisp/ox.el (org-export-dictionary): Add entries relative to
  longtables.  Fix some other entries.

4 years agoob-ebnf: Fix copyright and style
Nicolas Goaziou [Tue, 29 Oct 2013 14:18:24 +0000 (15:18 +0100)]
ob-ebnf: Fix copyright and style

* lisp/ob-ebnf.el (org-babel-execute:ebnf): Fix style.

4 years agoMerge branch 'maint'
Nicolas Goaziou [Tue, 29 Oct 2013 08:57:48 +0000 (09:57 +0100)]
Merge branch 'maint'

4 years agoFix `org-insert-heading' at buffer boundaries
Nicolas Goaziou [Tue, 29 Oct 2013 08:55:01 +0000 (09:55 +0100)]
Fix `org-insert-heading' at buffer boundaries

* lisp/org.el (org-insert-heading): Do not error out when inserting is
  to be done at one of the buffer's boundaries.
* testing/lisp/test-org.el: Add tests.

4 years agoFix org-insert-todo-heading-respect-content in plain list item
Ingo Lohmar [Sun, 27 Oct 2013 16:34:22 +0000 (17:34 +0100)]
Fix org-insert-todo-heading-respect-content in plain list item

* lisp/org.el (org-insert-todo-heading-respect-content): Pass correct
prefix arg to always insert heading.


This function used a second argument t, which is eventually passed to
org-insert-heading, adding a list item when inside a plain list.  Use
the proper argument '(4) now, to always create a heading, just like
the function's name and documentation imply.

4 years agoFix org-src-edit interaction with undo.
Aaron Ecay [Wed, 28 Aug 2013 15:50:53 +0000 (11:50 -0400)]
Fix org-src-edit interaction with undo.

* org-src.el (org-edit-src-exit): Place an undo boundary before
writing changes back to parent buffer.

The previous code attempted to preserve the undo information in the
indirect buffer editing the source code, but this interacts poorly
with the undo system, and can lead to undo operations scrambling the
buffer.  The new approach means that edits made in the indirect buffer
cannot be undone piece-by-piece (instead, all changes made in the
indirect buffer constitute one “change” from the point of view of
undo), but the misbehavior of undo is (hopefully) now avoided.

4 years agoMerge branch 'maint'
Nicolas Goaziou [Mon, 28 Oct 2013 08:53:42 +0000 (09:53 +0100)]
Merge branch 'maint'

4 years agoCorrectly indent BEGIN_SRC and END_SRC lines
Joost Diepenmaat [Fri, 25 Oct 2013 09:08:46 +0000 (11:08 +0200)]
Correctly indent BEGIN_SRC and END_SRC lines

* lisp/org.el (org-indent-region): BEGIN_SRC and END_SRC lines should
  not be considered part of the source block for the purposes of


4 years agoox-confluence: update maintainer's email address
Sébastien Delafond [Sun, 27 Oct 2013 17:34:57 +0000 (18:34 +0100)]
ox-confluence: update maintainer's email address

  * contrib/lisp/ox-confluence.el: current email address for


4 years agoox-confluence: Handle lists
Sébastien Delafond [Sun, 27 Oct 2013 17:20:46 +0000 (18:20 +0100)]
ox-confluence: Handle lists

  * contrib/lisp/ox-confluence.el (org-confluence-item,
    org-confluence--li-depth): New functions.

Patch proposed by <>.

4 years agoorg-element: Small change to src block indentation
Nicolas Goaziou [Sun, 27 Oct 2013 10:03:05 +0000 (11:03 +0100)]
org-element: Small change to src block indentation

* lisp/org-element.el (org-element-remove-indentation): Renamed from
(org-element-example-block-interpreter, org-element-src-block-parser):
Do not depend on `org-src-preserve-indentation'.
(org-element-src-block-interpreter, org-element-example-block-parser):
Check `org-src-preserve-indentation'.
* lisp/ox.el (org-export-unravel-code): Handle
* testing/lisp/test-org-element.el: Update tests.

4 years agoob-tangle: Silence byte-compiler
Nicolas Goaziou [Sun, 27 Oct 2013 08:54:27 +0000 (09:54 +0100)]
ob-tangle: Silence byte-compiler

4 years agoox-latex: Longtable continuation strings customizable
Thomas Dye [Sun, 27 Oct 2013 00:37:30 +0000 (14:37 -1000)]
ox-latex: Longtable continuation strings customizable

* lisp/ox-latex.el (org-latex-longtable-continued-on,
  org-latex-longtable-continued-from): New variables.
(org-latex-table-row): Use new variables.

4 years agoox-latex: Add \endfirsthead to longtable export
Thomas Dye [Sat, 26 Oct 2013 23:52:05 +0000 (13:52 -1000)]
ox-latex: Add \endfirsthead to longtable export

* lisp/ox-latex.el (org-latex-table-row): Implements the \endfirsthead
command so the caption only appears once, at the top of the table.
Subsequent pages of the table start with "Continued from previous

4 years agoMerge branch 'maint'
Nicolas Goaziou [Sat, 26 Oct 2013 19:02:22 +0000 (21:02 +0200)]
Merge branch 'maint'

4 years agoox-latex: Fix docstring
Nicolas Goaziou [Sat, 26 Oct 2013 19:00:03 +0000 (21:00 +0200)]
ox-latex: Fix docstring

* lisp/ox-latex.el (org-latex-listings-options): Use correct number of
  backslash characters in the example.

Reported-by: Thomas S. Dye <>
4 years agoAdd ebnf support to babel.
Michael Gauland [Sat, 26 Oct 2013 06:16:54 +0000 (19:16 +1300)]
Add ebnf support to babel.

4 years agoMerge branch 'maint'
Nicolas Goaziou [Thu, 24 Oct 2013 15:22:26 +0000 (17:22 +0200)]
Merge branch 'maint'

4 years agoorg-element: Use `org-latex-regexps', not `org-format-latex-options'
Nicolas Goaziou [Thu, 24 Oct 2013 15:15:23 +0000 (17:15 +0200)]
org-element: Use `org-latex-regexps', not `org-format-latex-options'

* lisp/org-element.el (org-element-latex-or-entity-successor,
  org-element-latex-fragment-parser): Use `org-latex-regexps' instead
  of `org-format-latex-options'.
* testing/lisp/test-org-element.el: Fix tests.

`org-latex-regexps' defines the correct syntax for LaTeX code within
an Org buffer.  On the other hand, `org-format-latex-options'
determines which syntax can be previewed within the buffer.

4 years agoMerge branch 'maint'
Nicolas Goaziou [Thu, 24 Oct 2013 09:18:19 +0000 (11:18 +0200)]
Merge branch 'maint'

4 years agoorg.texi: Remove reference to quoted underscores
Nicolas Goaziou [Thu, 24 Oct 2013 09:16:19 +0000 (11:16 +0200)]
org.texi: Remove reference to quoted underscores

* doc/org.texi (Subscripts and superscripts): Remove reference to
  quoted underscores until this mechanism is implemented again.

4 years agoorg.texi: Improve Beamer export documentation
Nicolas Goaziou [Thu, 24 Oct 2013 09:14:55 +0000 (11:14 +0200)]
org.texi: Improve Beamer export documentation

* doc/org.texi (Beamer export): Be more accurate about BEAMER_OPT

4 years agoMerge branch 'maint'
Nicolas Goaziou [Wed, 23 Oct 2013 17:04:49 +0000 (19:04 +0200)]
Merge branch 'maint'

4 years agoox-odt: Stop adding leading space after line break
Christian Moe [Wed, 23 Oct 2013 16:49:03 +0000 (18:49 +0200)]
ox-odt: Stop adding leading space after line break

* lisp/ox-odt.el (org-odt-line-break, org-odt-plain-text): Remove
newline after line-break tag.

The exporter was pretty-printing the ODT XML with newlines after
forced line breaks, but LibreOffice would interpret those as
spaces.  This led to a leading space after every manual line break.

4 years agoMerge branch 'maint'
Nicolas Goaziou [Wed, 23 Oct 2013 16:29:06 +0000 (18:29 +0200)]
Merge branch 'maint'

4 years agoox-taskjuggler: Fix effort property
Nicolas Goaziou [Wed, 23 Oct 2013 16:22:39 +0000 (18:22 +0200)]
ox-taskjuggler: Fix effort property

* contrib/lisp/ox-taskjuggler.el (org-taskjuggler--build-task): Fix
  effort property if `org-effort-property' was changed.

4 years agoob-ruby.el: fix result of :results output :session combination.
Oleh Krehel [Mon, 21 Oct 2013 11:03:28 +0000 (13:03 +0200)]
ob-ruby.el: fix result of :results output :session combination.

* lisp/ob-ruby.el (org-babel-ruby-evaluate):
  set conf.echo=false for the duration of evaluation.

* testing/lisp/test-ob-ruby.el (test-ob-ruby/session-output): new test.

4 years agofix typo in `org-babel-under-commented-heading-p'
Eric Schulte [Sun, 20 Oct 2013 21:55:06 +0000 (15:55 -0600)]
fix typo in `org-babel-under-commented-heading-p'

    Thanks to Alan Schmitt for pointing this out.

* lisp/ob-tangle.el (org-babel-under-commented-heading-p): Fix name

4 years agoorg-element: Do not retrieve Babel related info
Nicolas Goaziou [Sun, 20 Oct 2013 11:14:23 +0000 (13:14 +0200)]
org-element: Do not retrieve Babel related info

* lisp/org-element.el (org-element-babel-call-parser,
  org-element-inline-babel-call-parser): Do not call
  `org-babel-lob-get-info' since it is out of parser's scope.
org-element-inline-babel-call-interpreter): Apply changes to parsers.