29 hours agoorg.texi: Remove reference to deleted command master
Kyle Meyer [Wed, 29 Oct 2014 05:37:20 +0000]
org.texi: Remove reference to deleted command

* doc/org.texi (Inserting deadlines or schedules): Remove entry for
`org-mark-entry-for-agenda-action', which was deleted in commit f95e5ff.

29 hours agoFix missing syntax highlighting with #+SETUPFILE
Nicolas Goaziou [Thu, 30 Oct 2014 00:10:59 +0000]
Fix missing syntax highlighting with #+SETUPFILE

* lisp/org.el (org--setup-collect-keywords): Fix wrong argument
  order.  Avoid needless recursion.

Reported-by: Kyle Meyer <>

47 hours agoox-latex: Add missing defcustom keywords
Nicolas Goaziou [Wed, 29 Oct 2014 21:18:00 +0000]
ox-latex: Add missing defcustom keywords

* lisp/ox-latex.el (org-latex-caption-above): Add missing keywords.

2 days agoorg.texi: Update LaTeX environment syntax
Nicolas Goaziou [Wed, 29 Oct 2014 17:14:08 +0000]
org.texi: Update LaTeX environment syntax

* doc/org.texi (@LaTeX{} fragments): Update environments syntax.

2 days agoFix ccde27d
Nicolas Goaziou [Wed, 29 Oct 2014 16:49:21 +0000]
Fix ccde27d

* doc/org.texi (Special symbols): Fix

2 days agoorg.texi: Minor correction.
rasmus [Wed, 29 Oct 2014 13:10:43 +0000]
org.texi: Minor correction.

* org.texi (Special symbols): Correct output of fragment export.

2 days agoFix 8daf4a8
Nicolas Goaziou [Wed, 29 Oct 2014 10:57:42 +0000]
Fix 8daf4a8

* lisp/org.el (org-format-latex): Fix regexp.

2 days agoFix preview latex
Nicolas Goaziou [Tue, 28 Oct 2014 22:51:38 +0000]
Fix preview latex

* lisp/org.el (org-toggle-latex-fragment): Fix previewing nested
(org-format-latex): Change signature.  Rewrite using Elements.

* lisp/ox-html (org-html-format-latex):
* lisp/ox-odt (org-odt--translate-latex-fragments): Apply signature

Reported-by: Andreas Leha <>


3 days agoRefactor logging code
Nicolas Goaziou [Tue, 28 Oct 2014 12:51:36 +0000]
Refactor logging code

* lisp/org.el (org-log-beginning): New function.
(org-ts-regexp-inactive): New variable.
(org-add-log-setup): Use new function.
(org-skip-over-state-notes): Make function more robust to
(org-store-log-note): Update function according to previous changes.
Small refactoring.

3 days agoUpdate custom properties handling
Nicolas Goaziou [Thu, 16 Oct 2014 07:27:10 +0000]
Update custom properties handling

* lisp/org.el (org-toggle-custom-properties-visibility): Improve
correctness and speed.

* testing/lisp/test-org.el (test-org/custom-properties): New test.

3 days agoFix multiple TODO keywords
Nicolas Goaziou [Wed, 15 Oct 2014 08:49:40 +0000]
Fix multiple TODO keywords

* lisp/org.el (org--setup-collect-keywords): Correctly collect
  multiple TODO lines.
* testing/lisp/test-org.el (test-org/set-regexps-and-options): Add

Thanks to Eric Abrahamsen for reporting it.

3 days agoFix property drawer insertion with consecutive headlines
Nicolas Goaziou [Tue, 14 Oct 2014 19:18:44 +0000]
Fix property drawer insertion with consecutive headlines

* lisp/org.el (org-get-property-block): Fix property drawer insertion
  with consecutive headlines
* testing/lisp/test-org.el (test-org/entry-put): Add test.

Thanks to Eric Abrahamsen for reporting it.

3 days agoORG-NEWS: Document property drawers syntax change
Nicolas Goaziou [Tue, 14 Oct 2014 14:02:35 +0000]
ORG-NEWS: Document property drawers syntax change

3 days agoDocument new properties drawers syntax
Nicolas Goaziou [Tue, 14 Oct 2014 08:59:39 +0000]
Document new properties drawers syntax

* doc/org.texi (Per-file keywords): Remove wrong limitation.
(Tracking your habits): Make sure state changes appear after the
properties drawer.
(Property syntax): Specify new syntax.
(Using the property API): Fix a function definition.

3 days agoAdd test for setup keywords initialization
Nicolas Goaziou [Tue, 14 Oct 2014 08:53:47 +0000]
Add test for setup keywords initialization

* testing/lisp/test-org.el (test-org/set-regexps-and-options): New test.

* testing/examples/ Add a keyword for testing.

3 days agoRewrite setup keywords initialization
Nicolas Goaziou [Tue, 14 Oct 2014 08:53:29 +0000]
Rewrite setup keywords initialization

* lisp/org-table.el (org-table-set-constants): Remove function.
* lisp/org.el (org-set-regexps-and-options): Rewrite function.  Merge
  it with `org-set-regexps-and-options-for-tags'.
(org-set-regexps-and-options-for-tags): Remove function
(org--setup-collect-keywords, org--setup-process-tags): New functions.
(org-mode): Remove `org-set-regexps-and-options-for-tags' call.
(org-agenda-prepare-buffers): Use optimized setup for tags in all
cases.  Improve docstring.
(org-make-options-regexp): Make returned regexp more efficient.

3 days agoorg-table: Do not look after CONSTANTS in Orgtbl mode
Nicolas Goaziou [Fri, 10 Oct 2014 14:27:56 +0000]
org-table: Do not look after CONSTANTS in Orgtbl mode

* lisp/org-table.el (orgtbl-ctrl-c-ctrl-c): Do not set constants.

Orgtbl provides limited support for Org tables in an arbitrary major
mode.  Any Org syntax outside tables, including keywords, cannot be
supported in this environment.  Therefore there is no point to look
for CONSTANTS keywords.  Moreover, constants can be defined within the

This change allows to move `org-table-set-constants' feature to
`org-set-regexps-and-options' and treat CONSTANTS keyword like any
other keyword (e.g., defining it in a SETUPFILE).

3 days agoTurn buffer local syntax variables into constants
Nicolas Goaziou [Sun, 5 Oct 2014 10:50:05 +0000]
Turn buffer local syntax variables into constants

* lisp/org.el (org-ds-keyword-length, org-deadline-regexp,
  org-deadline-time-regexp, org-deadline-time-hour-regexp,
  org-deadline-line-regexp, org-scheduled-regexp,
  org-scheduled-time-regexp, org-scheduled-time-hour-regexp,
  org-closed-time-regexp, org-keyword-time-regexp,
  org-keyword-time-not-clock-regexp, org-maybe-keyword-time-regexp,
  org-all-time-keywords): Turn into a defconst, no longer
(org-set-regexps-and-options): No need to set anymore previous

3 days agoox: Update INCLUDE keywords wrt property drawers
Nicolas Goaziou [Fri, 3 Oct 2014 20:00:32 +0000]
ox: Update INCLUDE keywords wrt property drawers

* lisp/ox.el (org-export--inclusion-absolute-lines): Fix comment.
(org-export--prepare-file-contents):  Do not look for property drawers
after a drawer, since this is impossible.

* testing/examples/ Fix test data.

3 days agoSmall refactoring
Nicolas Goaziou [Mon, 22 Sep 2014 20:29:22 +0000]
Small refactoring

* lisp/org.el (org-add-planning-info): Small refactoring.

3 days agoInsert logs after planning info and property drawer
Nicolas Goaziou [Mon, 22 Sep 2014 20:28:22 +0000]
Insert logs after planning info and property drawer

* lisp/org.el (org-add-log-setup): Set `org-log-note-marker' after
  planning info and property drawer.

3 days agoorg-clock: Insert clocks after meta data
Nicolas Goaziou [Sat, 20 Sep 2014 20:33:05 +0000]
org-clock: Insert clocks after meta data

* lisp/org-clock.el (org-clock-find-position): Make sure clocks, and
  possibly drawer containing them, are inserted after planning info
  and any property drawer.

3 days agoAdd tests for property API
Nicolas Goaziou [Mon, 15 Sep 2014 07:32:57 +0000]
Add tests for property API

* testing/lisp/test-org.el (test-org/entry-put, test-org/entry-get,
  test-org/entry-delete, test-org/buffer-property-keys,
  test-org/property-values, test-org/insert-property-drawer): New

3 days agoRewrite `org-entry-properties'
Nicolas Goaziou [Mon, 29 Sep 2014 22:56:35 +0000]
Rewrite `org-entry-properties'

* lisp/org.el (org-special-properties): Remove "CLOCK" as a special
(org-entry-properties): Rewrite function according to property drawer
syntax.  Change signature.
(org-entry-get): Apply signature change.

"CLOCK" removal is motivated by the fact that it isn't listed as
a special keyword in the manual, it is not used throughout the code
base, and there is no meaningful value for this property.

3 days agoUpdate property API
Nicolas Goaziou [Mon, 15 Sep 2014 07:32:49 +0000]
Update property API

* lisp/org.el (org-entry-put): Refactor code, taking into account
  changes to property drawer syntax.  Fix errors when handling special
  values, which cannot be symbols.  Remove CLOCKSUM handling.
(org-entry-get): Refactor code.
(org-entry-delete): Small refactoring, do not rely on
`org-remove-empty-drawer-at' since parser is not necessary here.
(org-buffer-property-keys): Fix infloop.  Ignore final "+" in extended
properties.  Refactor code.
(org-property-values): Include extended values.
(org-entry-get-with-inheritance, org-insert-property-drawer): Small
(org-insert-drawer): Fix docstring and comments.
(org--update-property-plist): Renamed from org-update-property-plist.
Use side effects.  Improve speed.

CLOCKSUM special property in `org-entry-put' is buggy (symbols instead
of strings) and ignores provided value.  Since the expected behaviour
is neither clear nor documented, the property is not handled anymore
by the function.

3 days agoUpdate `org-get-property-block'
Nicolas Goaziou [Sat, 13 Sep 2014 22:04:20 +0000]
Update `org-get-property-block'

* lisp/org.el (org-at-property-p): Rewrite.  Don't use `org-element-at-point'.  It
is faster to retrieve the property drawer location instead.
(org-get-property-block): Update function and docstring.  Change
(org-entry-properties, org-entry-put, org-buffer-property-keys): Apply
signature change.

3 days agoorg-element: Update property drawers parsing
Nicolas Goaziou [Sat, 13 Sep 2014 20:43:45 +0000]
org-element: Update property drawers parsing

* lisp/org-element.el (org-element--get-node-properties,
  org-element--get-time-properties): New functions.
(org-element-headline-parser, org-element-inlinetask-parser): Use new
(org-element-property-drawer-parser): Change signature.  Simplify
(org-element--current-element, org-element--next-mode): Property
drawers are located right after a headline or a planning element.

* testing/lisp/test-org-element.el (test-org-element/drawer-parser,
  test-org-element/property-drawer-interpreter): Update tests.
(test-org-element/property-drawer-parser): Add tests.
* testing/lisp/test-org.el (test-org/indent-line,
  test-org/indent-region, test-org/forward-paragraph,
  test-org/backward-paragraph): Update tests.

3 days agoUpdate property drawer and node property regexps
Nicolas Goaziou [Sat, 13 Sep 2014 20:43:10 +0000]
Update property drawer and node property regexps

* lisp/org.el (org-property-drawer-re, org-property-re): Update

4 days agoob-clojure.el: Fix compatibility issue
Oleh Krehel [Mon, 27 Oct 2014 14:26:47 +0000]
ob-clojure.el: Fix compatibility issue

* lisp/ob-clojure.el (org-babel-execute:clojure): Fix compatibility
    issue with cider >0.7.0.

5 days agoFix Flyspell check in row separators and empty verse blocks
Nicolas Goaziou [Sun, 26 Oct 2014 15:54:01 +0000]
Fix Flyspell check in row separators and empty verse blocks

* lisp/org.el (org--flyspell-object-check-p): New function.
(org-mode-flyspell-verify): Check that table row or verse block under
point is not empty.  Use previous function.

5 days agoox-html: Fix bug in c9ca0b6d.
Rasmus [Sun, 26 Oct 2014 00:48:27 +0000]
ox-html: Fix bug in c9ca0b6d.

* ox-html.el (org-html-inlinetask): Fix bug.

6 days agoox-latex: Change default value for `org-latex-caption-above'
Nicolas Goaziou [Fri, 24 Oct 2014 22:10:02 +0000]
ox-latex: Change default value for `org-latex-caption-above'

* lisp/ox-latex.el (org-latex-caption-above): Change default value.

`org-latex-table-caption-above' is removed completely since default
value do not match anymore.

See <>.

7 days agoox: Remove unnecessary code comments
Nicolas Goaziou [Fri, 24 Oct 2014 19:13:47 +0000]
ox: Remove unnecessary code comments

7 days agoBump Emacs version
Nicolas Goaziou [Fri, 24 Oct 2014 09:56:09 +0000]
Bump Emacs version

* lisp/ob-core.el (org-babel-examplize-region):
* lisp/ob-exp.el (org-babel-exp-inline-code-template):
* lisp/org-table.el (org-table-copy-increment):
* lisp/org.el (org-agenda-ignore-drawer-properties):
* lisp/ox-ascii.el (org-ascii-list-margin):
* lisp/ox-html.el (org-html-format-headline-function):
* lisp/ox-latex.el (org-latex-hyperref-template):
* lisp/ox-odt.el (org-odt-format-headline-function):
* lisp/ox-texinfo.el (org-texinfo-format-headline-function): Bump
  Emacs version.

9 days agoMerge branch 'maint'
Achim Gratz [Wed, 22 Oct 2014 19:10:18 +0000]
Merge branch 'maint'

9 days agoORG-NEWS: Document new options
rasmus [Wed, 22 Oct 2014 17:57:26 +0000]
ORG-NEWS: Document new options

11 days agoorg.el: Fix bindings of < and > for calendar scrolling maint
Marco Wahl [Mon, 20 Oct 2014 19:47:42 +0000]
org.el: Fix bindings of < and > for calendar scrolling

* lisp/org.el (org-read-date-minibuffer-local-map): Switch to the
  current calendar API for scrolling the calendar.

11 days agoorg.el: Use normalized names in org-agenda-file-p
Yann Hodique [Sun, 12 Oct 2014 15:42:04 +0000]
org.el: Use normalized names in org-agenda-file-p

* lisp/org.el (org-agenda-file-p): Make sure all filenames are
normalized before performing comparison.

11 days agocontrib/lisp/org-velocity: Fix failure for big window
Marco Wahl [Tue, 14 Oct 2014 18:07:31 +0000]
contrib/lisp/org-velocity: Fix failure for big window

* contrib/lisp/org-velocity.el (org-velocity-incremental-read): Reversed
  the estimation against window-height.

11 days agoorg-clock.el (org-clock-select-task): Kill temporary buffer
Bastien Guerry [Mon, 20 Oct 2014 13:27:46 +0000]
org-clock.el (org-clock-select-task): Kill temporary buffer

* org-clock.el (org-clock-select-task): Kill temporary buffer.

Thanks to Marcin Borkowski for this idea.

11 days agoorg.texi: Remove extraneous backslash in key sequence
Rafael Laboissiere [Sun, 19 Oct 2014 20:37:39 +0000]
org.texi: Remove extraneous backslash in key sequence

* doc/org.texi (ASCII bar plots): Remove the backslash character in
the key binding sequence for orgtbl-ascii-plot command.

I think that this backslash is not needed, since previously in the
same section, at subheading "Graphical plots using Gnuplot", there is
a similar key sequence without backslash @kbd{C-c " g}.


13 days agoox-latex: Possibly make a matrix out of tabular environment
Nicolas Goaziou [Sat, 18 Oct 2014 08:16:04 +0000]
ox-latex: Possibly make a matrix out of tabular environment

* lisp/ox-latex.el (org-latex--math-table): Properly create matrix if
  "tabular" environment is used.  Make sure cells are centered instead
  of applying usual alignment rules.

13 days agoox-latex: Tiny fix to latex-matrices pseudo-elements
Nicolas Goaziou [Sat, 18 Oct 2014 08:15:29 +0000]
ox-latex: Tiny fix to latex-matrices pseudo-elements

* lisp/ox-latex.el (org-latex--wrap-latex-matrices): Make sure
  contiguous element is also an Org table.

2 weeks agoox-latex: Add `org-latex-caption-above'
Nicolas Goaziou [Fri, 17 Oct 2014 15:19:30 +0000]
ox-latex: Add `org-latex-caption-above'

* lisp/ox-latex.el (org-latex-caption-above): New variable.
(org-latex-table-caption-above): Remove variable.  Make it an obsolete
alias of the previous one.
(org-latex--caption-above-p): New function.
(org-latex--inline-image, org-latex-src-block,
org-latex-special-block, org-latex table): Handle new variable.

* doc/org.texi (Publishing options):
* etc/ORG-NEWS: Document new option.

2 weeks agoox-latex: Refactor matrices code
Nicolas Goaziou [Fri, 17 Oct 2014 15:16:28 +0000]
ox-latex: Refactor matrices code

* lisp/ox-latex.el (latex): Introduce a dedicated pseudo-element:
  (org-latex--wrap-latex-matrices, org-latex-matrices,
  org-latex-matrices-tree-filter): New functions.
  (org-latex--math-table): Delegate environment wrapping to new
  pseudo-element translator.

2 weeks agoORG-NEWS: Document new hook and new defcustom
Nicolas Goaziou [Thu, 16 Oct 2014 22:26:51 +0000]
ORG-NEWS: Document new hook and new defcustom

2 weeks agoorg-clock: Fix CLOCK_INTO_DRAWER property check
Kyle Meyer [Thu, 16 Oct 2014 19:17:00 +0000]
org-clock: Fix CLOCK_INTO_DRAWER property check

* lisp/org-clock.el (org-clock-into-drawer): Fix processing of
properties so that they can override global value.

Previously, if the 'CLOCK_INTO_DRAWER' or 'LOG_INTO_DRAWER' property was
nil, the local property setting would not override the global
variable [1]. These changes make the behavior match the docstring
description ('CLOCK_INTO_DRAWER' and 'LOG_INTO_DRAWER' properties
override `org-clock-into-drawer', with 'CLOCK_INTO_DRAWER' given



2 weeks agoorg-attach: Maybe delete heading attachments when archiving
Eric Abrahamsen [Tue, 14 Oct 2014 01:51:01 +0000]
org-attach: Maybe delete heading attachments when archiving

* lisp/org-attach.el (org-attach-archive-delete): New option
  controlling what to do with attachments when
(org-attach-archive-delete-maybe): New function that runs as a hook on
  org-archive-hook.  Checks the value of `org-attach-archive-delete',
  and behaves accordingly.

2 weeks agoorg-archive: Provide a hook during the archive process
Eric Abrahamsen [Tue, 14 Oct 2014 01:38:41 +0000]
org-archive: Provide a hook during the archive process

* lisp/org-archive.el (org-archive-hook): New hook.
  (org-archive-subtree): Run hook.

2 weeks agoMerge branch 'master' of
David Arroyo Menéndez [Wed, 15 Oct 2014 13:08:54 +0000]
Merge branch 'master' of

2 weeks agoorg-effectiveness.el: Add org-effectiveness-plot-save
David Arroyo Menéndez [Wed, 15 Oct 2014 12:58:13 +0000]
org-effectiveness.el: Add org-effectiveness-plot-save

* contrib/lisp/org-effectiveness.el (org-effectiveness-plot): Adapt source to save as file image.
(org-effectiveness-plot-save): Add function.

2 weeks agoorg-mac-link.el: Fix malformed Safari links
Alan Schmitt [Wed, 15 Oct 2014 08:17:34 +0000]
org-mac-link.el: Fix malformed Safari links

* contrib/lisp/org-mac-link.el (org-as-mac-safari-get-frontmost-url):
Run only the AppleScript.
(org-mac-safari-get-frontmost-url): reuse
`org-mac-paste-applescript-links' to properly deal with quotes.

2 weeks agoDocument ASCII-art plot
Thierry Banel [Tue, 14 Oct 2014 20:34:54 +0000]
Document ASCII-art plot

* doc/org.texi: Extend Gnuplot chapter to ASCII-art plotting.
* etc/ORG-NEWS: Document ASCII-art plot.

2 weeks agoorg-capture: Better indentation when creating a new list
Andrew Burgess [Tue, 7 Oct 2014 15:59:23 +0000]
org-capture: Better indentation when creating a new list

lisp/org-capture.el (org-capture-place-item): When starting a new list
use org-indent-line to establish the correct indentation rather than
just using 0.

Creating an entry in org-capture-templates of type item adds entries
into a list, however, currently, if the list is empty then the first
list item will always be indented to depth 0 (so hard on the left),
which looks like this:

  * Top Level
  ** Second Level
  - item #1
  - item #2
  - item #3

This is fine if org-adapt-indentation is nil, however, with the
default value of t lists should be indented more like this:

  * Top Level
  ** Second Level
     - item #1
     - item #2
     - item #3

The patch below changes org-capture-place-item so that, when starting
a new list, the items are indented as above.

Care is taken to preserve two features of the existing behaviour,
first, when adding to an existing list, new items are indented to
match the items already in the list.  And secondly, when there is some
introductory text before the list new items are inserted after the
text, like this:

  * Top Level
  ** Second Level
     This is some introductory text:
     - item #1
     - item #2
     - item #3


2 weeks agoorg.texi: Tiny fix
Nicolas Goaziou [Tue, 14 Oct 2014 10:14:55 +0000]
org.texi: Tiny fix

* doc/org.texi (An example): Tiny fix.

2 weeks agoob-clojure: Silence byte-compiler
Nicolas Goaziou [Mon, 13 Oct 2014 20:05:12 +0000]
ob-clojure: Silence byte-compiler

2 weeks agoFix indentation in lists
Nicolas Goaziou [Mon, 13 Oct 2014 17:03:14 +0000]
Fix indentation in lists

* lisp/org-list.el (org-list-item-body-column): Take into
  consideration empty items and bullets followed by two spaces.

* lisp/org.el (org--get-expected-indentation): Fix return value for
  items in lists.
(org-indent-region): Fix infloop when indenting some types of plain
lists.  Also fix error when region starts with blank lines at the
beginning of the buffer.

* testing/lisp/test-org.el (test-org/indent-region): Add tests.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Mon, 13 Oct 2014 16:16:04 +0000]
Merge branch 'maint'

2 weeks agoImprove functionality of org-passwords.el
Jorge A. Alfaro Murillo [Sun, 12 Oct 2014 20:14:34 +0000]
Improve functionality of org-passwords.el

* contrib/lisp/org-passwords.el (org-passwords-default-password-size):
  New variable.
(org-passwords-default-random-words-number): New variable.
(org-passwords-copy-username, org-passwords-copy-password): Use
`org-entry-get' to obtain the property value.
(org-passwords-open-url): New function.
(org-passwords): Can be called with universal argument.
(org-passwords-generate-password): Use default size given by
(org-passwords-random-words): Use default number given by
(org-passwords-concat-this-with-string): Fix bug.

The patch adds several functionality:

Open the URL property directly from the mode. URLs can be inherit.

Universal argument in org-passwords allows for longer browsing. Two
arguments is used for editing.

There is a default password size and random-words number for faster
password generating.

Fix bug in C-u M-x org-passwords-generate-password.

Commentary in file has more information.

2 weeks ago[PATCH] Fix: Emacs 25 fancy diary inclusion in agenda release_8.2.10
Marco Wahl [Sat, 11 Oct 2014 16:16:36 +0000]
[PATCH] Fix: Emacs 25 fancy diary inclusion in agenda

* lisp/org-agenda.el (org-get-entries-from-diary): Use the suitable
  display function.  Drop the usage of the obsolete diary-display-hook.

fancy-diary-display has been dropped in Emacs 25.  diary-fancy-display
is the long known replacement of fancy-diary-display.

diary-display-hook has been marked obsolete before Emacs 23.2.

2 weeks agoox: Fix failing test
Nicolas Goaziou [Sun, 12 Oct 2014 21:18:40 +0000]
ox: Fix failing test

* testing/lisp/test-ox.el (test-org-export/footnotes): Fix test.

2 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sun, 12 Oct 2014 20:55:38 +0000]
Merge branch 'maint'

2 weeks agoox: Fix 88457acff411eca9b32c04b4bc100ef094a23c5c
Nicolas Goaziou [Sun, 12 Oct 2014 20:47:48 +0000]
ox: Fix 88457acff411eca9b32c04b4bc100ef094a23c5c

* lisp/ox.el (org-export-async-start): Limit first argument to lambda
* lisp/ox-publish.el (org-publish, org-publish-all,
  org-publish-current-file): Replace `ignore', per limit stated above.

Due to a hack allowing to provide quasi-quoted lambda expressions,
symbols are not allowed as result handler.  This limitation is not
much of a problem as `org-export-async-start' is only meant to be used

2 weeks ago[export] Raise an error if footnote definition is not found.
Aaron Ecay [Sun, 28 Sep 2014 03:57:01 +0000]
[export] Raise an error if footnote definition is not found.

* lisp/ox.el (org-export-get-footnote-definition): Raise an error if
footnote definition is not found.

2 weeks agoWarn about unexpanded macros on export
Aaron Ecay [Sun, 28 Sep 2014 03:50:23 +0000]
Warn about unexpanded macros on export

* lisp/org-macro.el (org-macro-replace-all): Add optional `finalize'
* lisp/ox.el (org-export-as): Use it.

2 weeks agoorg-passwords.el: Fix `org-passwords-generate-password-with-symbols` to not insert...
Jonathan Leech-Pepin [Thu, 4 Sep 2014 12:31:09 +0000]
org-passwords.el: Fix `org-passwords-generate-password-with-symbols` to not insert password

* org-passwords.el (org-passwords-generate-password-with-symbols): Do not insert password,
this matches how `org-passwords-generate-password-without-symbols` behaves.

2 weeks agoEnable multiple files in :includes header
Thierry Banel [Thu, 4 Sep 2014 17:30:54 +0000]
Enable multiple files in :includes header

* ob-C.el (org-babel-C-expand-C, org-babel-C-expand-D): Let
:includes, :defines, :imports accept several items separated by
blanks without enclosing them in parenthesis.

Thanks to Will Everett for reporting this.

2 weeks agoAscii and Gnuplot key-bindings
Thierry Banel [Sat, 11 Oct 2014 13:59:17 +0000]
Ascii and Gnuplot key-bindings

* org.el (org-mode-map): change key-binding from C-c p to C-c " a add
C-c " g key-binding for Gnuplot
(org-tbl-menu): add sub-menu for plotting featuring Gnuplot and ascii
* org-table.el (orgtbl-setup): add sub-menu for plotting featuring
Gnuplot and ascii plot

2 weeks agoorg-table: Field formulas can now create columns as needed
Dima Kogan [Wed, 1 Oct 2014 05:36:21 +0000]
org-table: Field formulas can now create columns as needed

* org-table.el (org-table-formula-create-columns): New variable.
(org-table-recalculate): Use the new org-table-formula-make-new-cols
customization to control whether org creates new columns when
a formula explicitly targets them.

2 weeks agoMerge branch 'maint'
Bastien Guerry [Sun, 12 Oct 2014 05:03:23 +0000]
Merge branch 'maint'

2 weeks agoorg.el (orgstruct-make-binding): Do not use loop in interpreted code. release_8.2.9
Christopher Schmidt [Sat, 11 Oct 2014 19:40:45 +0000]
org.el (orgstruct-make-binding): Do not use loop in interpreted code.

* lisp/org.el (orgstruct-make-binding): Do not use loop in
interpreted code.

2 weeks agoorg.el (orgstruct-make-binding): Do not use loop in interpreted code.
Christopher Schmidt [Sat, 11 Oct 2014 19:40:45 +0000]
org.el (orgstruct-make-binding): Do not use loop in interpreted code.

* lisp/org.el (orgstruct-make-binding): Do not use loop in
interpreted code.

2 weeks ago[PATCH] Fix: Emacs 25 fancy diary inclusion in agenda
Marco Wahl [Sat, 11 Oct 2014 16:16:36 +0000]
[PATCH] Fix: Emacs 25 fancy diary inclusion in agenda

* lisp/org-agenda.el (org-get-entries-from-diary): Use the suitable
  display function.  Drop the usage of the obsolete diary-display-hook.

fancy-diary-display has been dropped in Emacs 25.  diary-fancy-display
is the long known replacement of fancy-diary-display.

diary-display-hook has been marked obsolete before Emacs 23.2.

2 weeks agoorg-table: Fix :raw parameter in radio tables
Nicolas Goaziou [Sat, 11 Oct 2014 15:01:59 +0000]
org-table: Fix :raw parameter in radio tables

* lisp/org-table.el (org-table--to-generic-cell): Use
  `org-element-interpret' data when parameter :raw is non-nil so
  pseudo elements and objects are not ignored.

* testing/lisp/test-org-table.el (test-org-table/to-latex): Add test.

Thanks to Giuseppe Lipari for reporting it.

3 weeks agoob-R: fix interaction with ESS for new sessions
Aaron Ecay [Fri, 10 Oct 2014 04:35:41 +0000]
ob-R: fix interaction with ESS for new sessions

* lisp/ob-R.el (org-babel-R-initiate-session): Properly wait on a new
ESS process.

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Fri, 10 Oct 2014 09:11:06 +0000]
Merge branch 'maint'

3 weeks agoox: Fix "void-variable ignore" error when publishing
Nicolas Goaziou [Fri, 10 Oct 2014 09:05:06 +0000]
ox: Fix "void-variable ignore" error when publishing

* lisp/ox.el (org-export-async-start): Allow to use symbols as

Thanks to Julien Cubizolles for reporting it.

3 weeks agoob-R.el: Add package name to read.table call
Rainer M. Krug [Mon, 6 Oct 2014 11:48:49 +0000]
ob-R.el: Add package name to read.table call

* lisp/ob-R.el: (ob-R-transfer-variable-table-with-header)
(ob-R-transfer-variable-table-without-header): Add package name to
call of R function `read.table'.

Thus, it now reads `utils::read.table'.  This clarifies the call as
well as avoids "could not find function" error in R with the devtools
package.  See

3 weeks agoorg-mac-link.el: Fix malformed message links
Alan Schmitt [Thu, 9 Oct 2014 12:12:05 +0000]
org-mac-link.el: Fix malformed message links

* contrib/lisp/org-mac-link.el (org-mac-message-get-links): Fix and use the `org-mac-paste-applescript-links' helper.

The existing code inserted links which should have been "[[message:ABC][the subject]]"
as "[[essage:ABC][the subjec]]".

Based on a patch by Steve Purcell <>.

3 weeks agoorg-mac-link.el: Fix multi-line file description
Steve Purcell [Wed, 24 Sep 2014 10:44:07 +0000]
org-mac-link.el: Fix multi-line file description

* contrib/lisp/org-mac-link.el: Shorten the file description, which shouldn't span lines.


Signed-off-by: Alan Schmitt <>

3 weeks agoorg-mac-link.el: Don't fail on machines without Growl installed
Steve Purcell [Wed, 24 Sep 2014 11:07:20 +0000]
org-mac-link.el: Don't fail on machines without Growl installed

* contrib/lisp/org-mac-link.el (org-as-get-flagged-mail): Don't assume Growl is installed.

Applescript can't run if it refers to uninstalled apps, so since Growl is not universally
installed, references to it should be dropped. This change also provides a less cryptic
message when `org-mac-mail-account' is unset at the time flagged messages are grabbed.


Signed-off-by: Alan Schmitt <>

3 weeks ago orgguide.texi: break lines after @noindent
David Arroyo Menéndez [Wed, 8 Oct 2014 13:06:42 +0000]
orgguide.texi: break lines after @noindent

    * doc/orgguide.texi: to avoid troubles with po4a, I've added break lines after @noindent

3 weeks agoorg-eww.el: Special kill in eww for Org for keeping the links
Marco Wahl [Tue, 7 Oct 2014 14:07:15 +0000]
org-eww.el: Special kill in eww for Org for keeping the links

* contrib/lisp/org-eww.el(org-eww-copy-for-org-mode): Realization of
  the kill.
  org-eww-no-next-link-p, org-eww-url-below-point): Auxiliaries
  for accessing a eww buffer
  (org-eww-extend-eww-keymap): Add the new kill to eww keymap

The code has emerged from the very similar org-w3m.el.

3 weeks agoFix 464cd96
rasmus [Tue, 7 Oct 2014 13:19:38 +0000]
Fix 464cd96

* OrgOdtStyles.xml: Fix error introduced in 464cd96.

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Tue, 7 Oct 2014 10:29:35 +0000]
Merge branch 'maint'

3 weeks agoorg-agenda.el: Update docstring
Mike McLean [Mon, 6 Oct 2014 09:54:09 +0000]
org-agenda.el: Update docstring

    * org-agenda.el (org-agenda-time-grid): Change docstring.


3 weeks agoob-clojure.el: Fix compatibility issue
Bastien Guerry [Mon, 6 Oct 2014 13:47:40 +0000]
ob-clojure.el: Fix compatibility issue

* ob-clojure.el (org-babel-execute:clojure): Fix compatibility
issue with cider >0.7.0.  This breaks compatibility with Cider

Thanks to Daniel Szmulewicz for the suggested fix.

3 weeks agoMerge branch 'maint'
Bastien Guerry [Mon, 6 Oct 2014 12:29:01 +0000]
Merge branch 'maint'

3 weeks agoMerge branch 'master' of
Bastien Guerry [Mon, 6 Oct 2014 12:25:40 +0000]
Merge branch 'master' of

3 weeks agoob-clojure.el: Remove nrepl.el support
Bastien Guerry [Mon, 6 Oct 2014 09:56:04 +0000]
ob-clojure.el: Remove nrepl.el support

* ob-clojure.el (org-babel-clojure-backend)
(org-babel-execute:clojure): Remove nrepl.el support.

3 weeks agoBackport typo fixes from Emacs 24 branch
Bastien Guerry [Mon, 6 Oct 2014 09:52:30 +0000]
Backport typo fixes from Emacs 24 branch

3 weeks agoob-table: Updated documentation.
rasmus [Tue, 30 Sep 2014 09:53:36 +0000]
ob-table: Updated documentation.

* ob-table.el (org-sbe): Updated documentation.

3 weeks agoMerge remote-tracking branch 'origin/master'
Rasmus [Sat, 4 Oct 2014 10:06:14 +0000]
Merge remote-tracking branch 'origin/master'

3 weeks agoox-koma-letter.el: Update docstring.
Rasmus [Sat, 4 Oct 2014 10:00:22 +0000]
ox-koma-letter.el: Update docstring.

* ox-koma-letter.el (org-koma-letter-prefer-special-headings): Change

3 weeks agoMerge remote-tracking branch 'origin/master'
Rasmus [Sat, 4 Oct 2014 09:47:17 +0000]
Merge remote-tracking branch 'origin/master'

4 weeks agoFix 464cd96
Nicolas Goaziou [Fri, 3 Oct 2014 20:23:25 +0000]
Fix 464cd96

* lisp/ox-html.el (org-html-link):
* lisp/ox-md.el (org-md-link): Fix errors introduced in

4 weeks agoox: Support unnumbered headlines via property
Rasmus [Sun, 21 Sep 2014 14:17:55 +0000]
ox: Support unnumbered headlines via property

* ox.el (org-export--collect-headline-numbering): Ignore unnumbered headline.
org-export--collect-unnumbered-headline-id): New functions.
(org-export-numbered-headline-p): Further tests for unnumbered headline.
* ox-odt.el (org-odt-headline, org-odt-link,
ox-md.el (org-md-headline, org-md-link),
ox-latex.el (org-latex-headline, org.latex-link),
ox-html.el (org-html-headline, org-html-link),
ox-ascii.el (org-ascii-link): Support unnumbered headlines.
* test-ox.el (test-org-export/org-export-get-headline-id): New test.
* OrgOdtStyles.xml: Add styles for unnumbered headings.

4 weeks agotest-ox.el: Fix test-error from 986037a.
rasmus [Thu, 2 Oct 2014 17:41:31 +0000]
test-ox.el: Fix test-error from 986037a.

* test-ox.el (test-org-export/expand-include): Updated tests.

4 weeks agoFix `org-edit-special' on file names with spaces
Nicolas Goaziou [Thu, 2 Oct 2014 17:23:03 +0000]
Fix `org-edit-special' on file names with spaces

* lisp/org.el (org-edit-special): Fix function when INCLUDE or
  SETUPFILE keyword points to a file name with spaces.

4 weeks agoox: Allow file-links with #+INCLUDE-keyword
Rasmus [Sun, 28 Sep 2014 19:05:17 +0000]
ox: Allow file-links with #+INCLUDE-keyword

* org.el (org-edit-special): Handle file-links for INCLUDE.
* ox.el (org-export--prepare-file-contents): Handle links and
add option no-heading.
* ox.el (org-export-expand-include-keyword): Resolve headline
links and add option :only-contents.
* orgguide.texi (Include files)
org.texi (Include files): Updated.
* testing/examples/ New examples.
* test-ox.el (test-org-export/expand-include): New tests.