31 hours agoorg-table: Fix `org-table-eval-formula' maint
Nicolas Goaziou [Mon, 23 Nov 2015 22:19:14 +0000]
org-table: Fix `org-table-eval-formula'

* lisp/org-table.el (org-table-get-formula):
(org-table-store-formulas): Column formulas references are stored along
with their dollar-sign since "Fix `org-table-get-range' with column
formulas". Update functions accordingly.

Reported-by: John Hendy <>

44 hours agoox-publish: Handle includes with searches
Nick Gunn [Mon, 23 Nov 2015 09:50:03 +0000]
ox-publish: Handle includes with searches

* lisp/ox-publish.el (org-publish-cache-file-needs-publishing): Ignore
  any link search suffix on an include so that the path represents
  a valid file during the publishing check.


6 days agoorg-colview: Fix skip-empty-rows without ITEM
Nicolas Goaziou [Wed, 18 Nov 2015 22:36:23 +0000]
org-colview: Fix skip-empty-rows without ITEM

* lisp/org-colview.el (org-columns-capture-view): Obey to
  skip-empty-rows even when "ITEM" doesn't belong to current title.

Reported-by: Joon Ro <>

7 days agoBackport commit ac16149 from Emacs
Paul Eggert [Tue, 17 Nov 2015 23:28:50 +0000]
Backport commit ac16149 from Emacs

Fix docstring quoting problems with ‘ '’
Paul Eggert
Tue Nov 17 15:29:35 2015 -0800

10 days agoorg-feed.el: Load the xml library before substituting a guid XML element
Hiroshi Saito [Sun, 18 Oct 2015 23:07:01 +0000]
org-feed.el: Load the xml library before substituting a guid XML element

* lisp/org-feed.el (org-feed-parse-rss-feed): Load the xml library
before calling `xml-substitute-special`.


12 days agoorg-table: Fix `org-table-get-range' with column formulas
Nicolas Goaziou [Thu, 12 Nov 2015 22:12:18 +0000]
org-table: Fix `org-table-get-range' with column formulas

* lisp/org-table.el (org-table-get-stored-formulas): Store complete
  column formulas including the "$" sign.  Remove interactive status.
(org-table-get-range): Handle nicely "$n..$m" ranges.  Apply
changes to `org-table-get-stored-formulas'.  Rename some bindings for
(org-table-expand-lhs-ranges): Ignore column formalas.
(org-table-remote-reference-indirection): Refactor function.

Reported-by: Junpeng Qiu <>

12 days agoox: Fix comments removal
Nicolas Goaziou [Thu, 12 Nov 2015 10:28:13 +0000]
ox: Fix comments removal

* lisp/ox.el (org-export--delete-comments): Preserve document's
  structure when removing comment lines or comment blocks.

* testing/lisp/test-ox.el (test-org-export/comments): New test.

Reported-by: Samuel Wales <>

2 weeks agoorg-table: Fix code typo
Nicolas Goaziou [Wed, 11 Nov 2015 00:28:27 +0000]
org-table: Fix code typo

* lisp/org-table.el (org-table-analyze): Fix code typo introduced in

2 weeks agoorg-table: Fix bug with "$>" reference
Nicolas Goaziou [Tue, 10 Nov 2015 23:37:57 +0000]
org-table: Fix bug with "$>" reference

* lisp/org-table.el (org-table-analyze): Fix incorrect replacement for
  "$>" reference when the table ends on a hline.
* testing/lisp/test-org-table.el (test-org-table/end-on-hline): New

2 weeks agoFix table editing with an active region
Nicolas Goaziou [Thu, 5 Nov 2015 22:07:18 +0000]
Fix table editing with an active region

* lisp/org.el (org-self-insert-command): Do not call
  `backward-delete-char' since it possibly deletes active region.
  Simplify code.

This fixes bug#21838.

2 weeks agoFix bug#21818
Nicolas Goaziou [Thu, 5 Nov 2015 11:26:01 +0000]
Fix bug#21818

* lisp/org.el (org-insert-link): Redisplay after inserting link.

Reported-by: Emanuel Evans <>

3 weeks agoorg-format-outline-path: Ignore nil path elements
Kyle Meyer [Sat, 31 Oct 2015 16:36:16 +0000]
org-format-outline-path: Ignore nil path elements

* lisp/org.el (org-format-outline-path): Ignore nil path elements.
* testing/lisp/test-org.el (test-org/format-outline-path): Add test.

The PATH argument shouldn't contain a nil item.  However, this didn't
fail before 1c74002, and helm-get-org-candidates-in-file relies on this
behavior, so prevent it from failing now.

Reported-by: Simon Thum <>

3 weeks agoorg-format-outline-path: Cosmetic fix
Kyle Meyer [Sat, 31 Oct 2015 16:28:51 +0000]
org-format-outline-path: Cosmetic fix

* lisp/org.el (org-format-outline-path): Change loop counter.

The old version gives the same result when combined with the other for
clause, but it reads as though the intention is to reach
(length path) rather than (1- (length path)).

3 weeks agobabel: fix header arg duplication
Aaron Ecay [Thu, 29 Oct 2015 13:31:28 +0000]
babel: fix header arg duplication

* lisp/ob-core.el (org-babel-process-params): Make idempotent.
* testing/lisp/test-ob.el (ob/process-params-no-duplicates): New test.

4 weeks agoRewrite org-format-outline-path
Kyle Meyer [Tue, 27 Oct 2015 02:49:45 +0000]
Rewrite org-format-outline-path

* lisp/org.el (org-format-outline-path): Avoid out-of-range error when
  the length of PREFIX is greater than the value given for WIDTH.
  Prevent result from extending beyond WIDTH.  Simplify code.
* testing/lisp/test-org.el (test-org/format-outline-path): Add tests.

Reported-by: Simon Thum <>

4 weeks agodoc/org.texi: Add index for Archive mode
Marco Wahl [Tue, 27 Oct 2015 09:14:10 +0000]
doc/org.texi: Add index for Archive mode

4 weeks agoorg-clock: Fix clocking in
Nicolas Goaziou [Sun, 25 Oct 2015 14:51:53 +0000]
org-clock: Fix clocking in

* lisp/org-clock.el (org-clock-find-position): Correctly position cursor
  on the correct headline.

Reported-by: Jan Malakhovski <>

4 weeks agoob-core: Fix "wrong-type-argument stringp nil"
Nicolas Goaziou [Sat, 24 Oct 2015 09:37:46 +0000]
ob-core: Fix "wrong-type-argument stringp nil"

* lisp/ob-core.el (org-babel-merge-params): Tolerate empty :exports

Reported-by: Rainer M Krug <>

4 weeks agoRestore behavior of '.' in org-read-date
Kyle Meyer [Fri, 23 Oct 2015 15:15:44 +0000]
Restore behavior of '.' in org-read-date

* lisp/org.el (org-read-date-minibuffer-local-map): Fix period behavior
  broken by e802936.

Reported-by: Matt Lundin <>

5 weeks agoFix `org-return-follows-link' on links with emphasis
Nicolas Goaziou [Sun, 18 Oct 2015 07:36:15 +0000]
Fix `org-return-follows-link' on links with emphasis

* lisp/org.el (org-return): Properly follow links when description is
  emphasized.  Also tolerate links and timestamps in otherwise forbidden
  areas (e.g., comments, node properties...), much like

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

Reported-by: Samuel Wales <>

5 weeks agoox-ascii: Fix code typo
Nicolas Goaziou [Sun, 18 Oct 2015 07:27:28 +0000]
ox-ascii: Fix code typo

* lisp/ox-ascii.el (org-ascii--describe-links): Fix code typo introduced
  in d6a718a.

5 weeks agoorg-clock: Fix clock drawer creation
Nicolas Goaziou [Sat, 17 Oct 2015 23:39:36 +0000]
org-clock: Fix clock drawer creation

* lisp/org-clock.el (org-clock-find-position): Create clock drawer when
  a drawer is missing, even though requested, but some clocks are
  already present in the entry.

Reported-by: Nikolay Kudryavtsev <>

5 weeks agoox-ascii: Fix external id links
Nicolas Goaziou [Sat, 17 Oct 2015 22:02:31 +0000]
ox-ascii: Fix external id links

* lisp/ox-ascii.el (org-ascii--describe-links): Fix export when id link
  targets an external file.

Reported-by: Samuel Wales <>

5 weeks agoorg-element: Fix parsing of planning in inline tasks
Nicolas Goaziou [Fri, 16 Oct 2015 21:19:06 +0000]
org-element: Fix parsing of planning in inline tasks

* lisp/org-element.el (org-element--next-mode): Line following an
  inlinetask can be a planning.
* testing/lisp/test-org-element.el (test-org-element/inlinetask-parser):
  Update test.

Reported-by: Gregor Zattler <>

5 weeks agoox-beamer: Fix labels
Nicolas Goaziou [Fri, 16 Oct 2015 20:38:14 +0000]
ox-beamer: Fix labels

* lisp/ox-beamer.el (org-beamer--get-label): Remove protective braces
  when extracting label from options.
(org-beamer--format-frame): Protect label with braces if it contains

Based off a patch from Fabrice
Popineau (<>).

5 weeks agoorg.texi, orgguide.texi: Fix spelling of Sean Astin's name
Michael O'Connor [Wed, 14 Oct 2015 01:15:11 +0000]
org.texi, orgguide.texi: Fix spelling of Sean Astin's name

* doc/org.texi: Fix a typo of Sean Astin's name as Sean Austin.

* doc/orgguide.texi: Fix a typo of Sean Astin's name as Sean Austin.


5 weeks agoorg-clock: Fix quarterly clock reports
Nicolas Goaziou [Wed, 14 Oct 2015 22:03:36 +0000]
org-clock: Fix quarterly clock reports

* lisp/org-clock.el (org-clock-special-range): Properly set Q according
  to block specification.

Reported-by: "L.C. Karssen" <>

6 weeks agoox-beamer: Fix againframe command
Nicolas Goaziou [Tue, 13 Oct 2015 21:51:17 +0000]
ox-beamer: Fix againframe command

* lisp/ox-beamer.el (org-beamer-headline): Make sure any fuzzy reference
  provided for an againframe ends up pointing to a headline.

6 weeks agoorg-capture: Reverse capture finalize and refile, hack buffer killing
Jan Seeger [Fri, 25 Sep 2015 12:54:31 +0000]
org-capture: Reverse capture finalize and refile, hack buffer killing

* org-capture.el (org-capture-refile): Call finalize first, then
  refile. If the capture buffer needs to be killed afterwards, kill
  after refiling.

Refiling before finalizing led to an incorrect cursor position during
refile.  Since adjusting the buffer position and bounds for the refiled
entry is difficult, I reverted the `org-capture-refile' function to its
original order of finalizing and then refiling.  However, this leads to
a bug with killing the buffer on capture, described in
<>.  To work around
this, now the :kill-buffer flag is cleared before calling finalize, and
the capture buffer is killed after `org-refile' is called.


6 weeks agoob-clojure: Silence byte-compiler
Nicolas Goaziou [Sun, 11 Oct 2015 21:56:35 +0000]
ob-clojure: Silence byte-compiler

6 weeks agoob-clojure: Cider API change
Feng Zhou [Sun, 11 Oct 2015 12:18:08 +0000]
ob-clojure: Cider API change

* lisp/ob-clojure.el (org-babel-execute:clojure): Apply Cider API


7 weeks agoClean up spacing to pass Emacs's pre-commit check
Kyle Meyer [Mon, 10 Aug 2015 05:18:52 +0000]
Clean up spacing to pass Emacs's pre-commit check

This is in preparation for syncing with the Emacs repo.

7 weeks agoPass LIMIT argument to org-looking-back
Kyle Meyer [Sun, 27 Sep 2015 16:27:52 +0000]
Pass LIMIT argument to org-looking-back

* lisp/org-mouse.el (org-mouse-insert-item):
* lisp/org-pcomplete.el (org-thing-at-point):
* lisp/org.el (org-read-date-minibuffer-local-map):
(org-timestamp-change): Provide LIMIT argument to org-looking-back.
* lisp/org.el (org-read-date-minibuffer-local-map):
(org-insert-heading): Replace looking-back with org-looking-back.

As of Emacs 25, the LIMIT argument to looking-back is advertised as a
required argument.

7 weeks agoUse prefix for outline functions
Kyle Meyer [Sun, 27 Sep 2015 15:45:07 +0000]
Use prefix for outline functions

* lisp/ob-lilypond.el (org-babel-lilypond-mark-error-line):
* lisp/org-agenda.el (org-agenda-goto):
* lisp/org-archive.el (org-archive-subtree):
* lisp/org-capture.el:
* lisp/org-colview.el:
* lisp/org-crypt.el (org-encrypt-entry):
* lisp/org-feed.el (org-feed-update):
* lisp/org-mouse.el (org-mouse-popup-global-menu):
* lisp/org.el (org-cycle):
* lisp/ox-org.el (org-org-publish-to-org): Use prefix for outline
* lisp/org-compat.el: Add compatibility functions for outline functions
  that are under the "outline-" prefix as of Emacs 25.

7 weeks agoob-tangle: Check that publishing directory exists
Kyle Meyer [Sat, 3 Oct 2015 22:08:52 +0000]
ob-tangle: Check that publishing directory exists

* lisp/ob-tangle.el (org-babel-tangle-publish): Create publishing
  directory if it doesn't exist.

Reported-by: Arun Isaac <>

7 weeks agoox: Change misleading keys in `org-export-smart-quotes-alist'
Nicolas Goaziou [Sat, 3 Oct 2015 07:19:21 +0000]
ox: Change misleading keys in `org-export-smart-quotes-alist'

* lisp/ox.el (org-export-smart-quotes-alist):
(org-export--smart-quote-status): Change misleading quote names.

Due to the new smart quotes algorithm, "..." are always primary quotes,
even though they may be translated as single quotes.  Conversely, '...'
are secondary quotes and may not be translated to single quotes.

7 weeks agoob-tangle: Expand paths for publishing
Kyle Meyer [Sat, 3 Oct 2015 03:19:40 +0000]
ob-tangle: Expand paths for publishing

* lisp/ob-tangle.el (org-babel-tangle-file): Return expanded file name.

Reported-by:  Arun Isaac <>

7 weeks agoFix "undefined symbol 'org-export-create-backend"
Nicolas Goaziou [Thu, 1 Oct 2015 19:55:13 +0000]
Fix "undefined symbol 'org-export-create-backend"

* lisp/org-table.el (orgtbl-to-generic): Make sure "ox.el" is loaded
  before converting a radio table.

Reported-by: Dave Marquardt <>

7 weeks agoFix "org-remove-if: Wrong type argument: number-or-marker-p, nil"
Nicolas Goaziou [Thu, 1 Oct 2015 19:42:15 +0000]
Fix "org-remove-if: Wrong type argument: number-or-marker-p, nil"

* lisp/org.el (org-remove-latex-fragment-image-overlays): Remove
  overlays not associated to a buffer.

Reported-by: Rainer M Krug <>

7 weeks agoox-icalendar: Fix a docstring
Nicolas Goaziou [Thu, 1 Oct 2015 11:51:13 +0000]
ox-icalendar: Fix a docstring

* lisp/ox-icalendar.el (org-icalendar-exclude-tags): Fix docstring.


7 weeks agoorg-feed.el: Substitute a guid XML element
Hiroshi Saito [Sun, 27 Sep 2015 18:04:10 +0000]
org-feed.el: Substitute a guid XML element

* lisp/org-feed.el (org-feed-parse-rss-feed): Substitute a guid XML
element with `xml-substitute-special'.


8 weeks agoFix file uri release_8.3.2
Nicolas Goaziou [Fri, 25 Sep 2015 22:04:05 +0000]
Fix file uri

* lisp/ox.el (org-export-file-uri): Properly expand file uri.

* lisp/org-element.el (org-element-link-parser): Start path with "//"
  when referring to a remote file.

* testing/lisp/test-ox.el (test-org-export/file-uri): Add test.

Reported-by: AW <>

2 months agoox-md: Fix docstring
Nicolas Goaziou [Thu, 24 Sep 2015 08:27:24 +0000]
ox-md: Fix docstring

* lisp/ox-md.el (org-md-separate-elements): Fix docstring.

2 months agofix SETUPFILE pathname expansion with subdirectories
Richard Hansen [Sun, 20 Sep 2015 05:28:53 +0000]
fix SETUPFILE pathname expansion with subdirectories

* lisp/org-macro.el (org-macro--collect-macros): cd to the directory
containing the SETUPFILE before recursing so that relative pathnames
in the SETUPFILE are expanded properly.

* lisp/org.el (org--setup-collect-keywords): cd to the directory
containing the SETUPFILE before recursing so that relative pathnames
in the SETUPFILE are expanded properly.

* lisp/ox.el (org-export--get-inbuffer-options,
org-export--list-bound-variables): cd to the directory containing the
SETUPFILE before recursing so that relative pathnames in the SETUPFILE
are expanded properly.

If /path/to/ contains:

    #+SETUPFILE: settings/

and /path/to/settings/ contains:


then we want to read /path/to/settings/, not


2 months agoorg-table: Fix radio tables
Nicolas Goaziou [Wed, 23 Sep 2015 20:58:25 +0000]
org-table: Fix radio tables

* lisp/org-table.el (orgtbl-to-generic): Strip text properties from

Reported-by: "Charles C. Berry" <>

2 months agoox-md: Fix blank lines insertion in sub-lists
Nicolas Goaziou [Tue, 22 Sep 2015 19:32:07 +0000]
ox-md: Fix blank lines insertion in sub-lists

* lisp/ox-md.el (org-md-separate-elements): In a list, when a sub-list
  is followed by another element, make sure it is surrounded by blank

Reported-by: (Denis Bitouzé)

2 months agoFix end time shifting past midnight
Nicolas Goaziou [Tue, 22 Sep 2015 19:15:09 +0000]
Fix end time shifting past midnight

* lisp/org.el (org-modify-ts-extra): Properly wrap time after 23:59.

This can still generate wrong timestamps, e.g.

  <2015-09-21 Mo 23:00-23:55> => <2015-09-21 Mo 23:05-00:00>

but at least, the error is predictable.

Reported-by: Detlef Steuer <>

2 months agoBackport commit ab11a1c from Emacs master branch
Paul Eggert [Sun, 20 Sep 2015 16:40:35 +0000]
Backport commit ab11a1c from Emacs master branch

* lisp/ob-latex.el (convert-pdf):
* lisp/org-crypt.el (org-crypt-check-auto-save):
* lisp/ox-man.el (org-man-compile):
* lisp/ox-odt.el (org-odt--export-wrap):
* lisp/ox-texinfo.el (org-texinfo-compile):
Use %s to avoid translating quotes of file names etc. in diagnostics.

Use %s to format strings instead of splicing them
Paul Eggert
Sun Sep 20 09:42:05 2015 -0700

2 months agoorg-timer: Match paused timer value to docstring
Kyle Meyer [Tue, 22 Sep 2015 04:15:26 +0000]
org-timer: Match paused timer value to docstring

* lisp/org-timer.el (org-timer-pause-or-continue):
(org-timer-set-mode-line): Use `paused' rather than `pause'.
(org-timer-countdown-timer): Quote `paused' as symbol.

2 months agoorg-timer: Remove two progn's
Kyle Meyer [Tue, 22 Sep 2015 04:15:32 +0000]
org-timer: Remove two progn's

* lisp/org-timer.el (org-timer-pause-or-continue): Remove unnecessary
(org-timer-set-timer): Reverse condition to remove progn.

2 months agoPartially revert backport of commit 284c470
Kyle Meyer [Mon, 21 Sep 2015 04:25:13 +0000]
Partially revert backport of commit 284c470

Revert cases in the last backport that converted "\[" in strings to "[",
which results in an error when eval-defun is called on them.

2 months agoBackport commit 284c470 from Emacs master branch
Paul Eggert [Thu, 17 Sep 2015 23:08:20 +0000]
Backport commit 284c470 from Emacs master branch

Backslash cleanup in Elisp source files
Paul Eggert
Thu Sep 17 16:09:39 2015 -0700

2 months agoBackport commit 753fbfb from Emacs master branch
Paul Eggert [Thu, 17 Sep 2015 19:28:45 +0000]
Backport commit 753fbfb from Emacs master branch

* lisp/org-bibtex.el (org-bibtex-fields):
* lisp/org-docview.el (org-docview-export):
* lisp/org-entities.el (org-entities):
* lisp/ox-icalendar.el (org-icalendar-cleanup-string):
Fix typo by replacing ‘\’ with ‘\\’ in a string literal.
For example, to get the regular expression ‘\.’ use the string
literal "\\.", not "\." (which is equivalent to ".").

Fix several backslash typos in Elisp strings
Paul Eggert
Thu Sep 17 12:39:54 2015 -0700

2 months agoProtect remaining apostrophes in docstrings
Kyle Meyer [Mon, 21 Sep 2015 04:24:12 +0000]
Protect remaining apostrophes in docstrings

Protect apostrophes not covered by the last backport.  Convert
expressions like '(...)  to \\='(...)  and symbols written as 'name to
`name'.  (In addition to ensuring the correct display, the latter also
improves consistency with many Org docstrings.)

If these aren't protected, Emacs 25 may display them as curved quotes in
the help buffer, depending on the value of text-quoting-style.

2 months agoModify quote-related backport
Kyle Meyer [Mon, 21 Sep 2015 04:23:58 +0000]
Modify quote-related backport

These changes are in line with the changes proposed on the mailing list,
but many of those changes weren't necessary because they had already
been reverted in the Emacs repo.


2 months agoBackport quote-related commits from Emacs
Kyle Meyer [Mon, 21 Sep 2015 04:23:36 +0000]
Backport quote-related commits from Emacs

These changes are the combination of the commits below (in order
applied).  Unlike other backports, these are applied in one commit
because they are closely related and because some of the later commits
reverse changes in earlier commits.  Changes to message and help quote
display for Emacs 25 seem to be here to stay.  The quote protections are
required to ensure grave accents and apostrophes are displayed as
intended in Emacs 25, and they should not affect earlier versions.

  Quoting fixes in lisp/org
  Paul Eggert
  Mon Aug 31 00:29:40 2015 -0700

  More-conservative ‘format’ quote restyling
  Paul Eggert
  Sun Aug 23 22:39:06 2015 -0700

  Prefer directed to neutral quotes
  Paul Eggert
  Mon Aug 24 23:57:25 2015 -0700

  Escape ` and ' in doc
  Paul Eggert
  Tue Sep 1 18:23:21 2015 -0700

  Fix some more docstring etc. quoting problems
  Paul Eggert
  Thu Sep 3 15:32:54 2015 -0700

  Go back to grave quoting in source-code docstrings etc.
  Paul Eggert
  Mon Sep 7 16:09:27 2015 -0700

2 months agoUse substitute-command-keys more
Kyle Meyer [Mon, 21 Sep 2015 04:23:15 +0000]
Use substitute-command-keys more

* lisp/ob-core.el (org-confirm-babel-evaluate):
* lisp/org-agenda.el (org-agenda-log-mode-items):
* lisp/org-clock.el (org-clock-out-when-done):
* lisp/org-id.el (org-id-link-to-org-use-id):
* lisp/org-table.el (org-table-allow-automatic-line-recalculation):
* lisp/org.el (org-support-shift-select):
(org-ctrl-c-ctrl-c): Use substitute-command-keys.

2 months agoorg-agenda: Remove old binding from docstring
Kyle Meyer [Mon, 21 Sep 2015 04:24:29 +0000]
org-agenda: Remove old binding from docstring

* lisp/org-agenda.el (org-agenda-kill-all-agenda-buffers): Remove
  reference to stale key binding.

This binding was removed in 39c7630 (Clean up local variable stuff and
document sticky agenda buffers, 2012-03-10).

2 months agoox-md: Fix ID and custom ID links export
Nicolas Goaziou [Sun, 20 Sep 2015 20:27:09 +0000]
ox-md: Fix ID and custom ID links export

* lisp/ox-md.el (org-md-link): Use custom ID when referring to
  a headline.  Also fix default description for custom ID links.

Reported-by: (Denis Bitouzé)

2 months agoox-md: Fix TOC's internal links
Nicolas Goaziou [Sun, 20 Sep 2015 19:50:50 +0000]
ox-md: Fix TOC's internal links

* lisp/ox-md.el (org-md-headline): Use CUSTOM-ID when available.

TOC is generated using HTML export back-end, which links to headlines
through their custom ID, when available.  By anchoring that custom ID,
we make sure these links are not broken.

Reported-by: (Denis Bitouzé)

2 months agoorg-table: Silence byte-compiler
Nicolas Goaziou [Sat, 19 Sep 2015 14:36:26 +0000]
org-table: Silence byte-compiler

2 months agoorg-agenda.el: Fix org-agenda-with-point-at-orig-entry
Eric Abrahamsen [Sat, 19 Sep 2015 05:41:25 +0000]
org-agenda.el: Fix org-agenda-with-point-at-orig-entry

* lisp/org-agenda.el (org-agenda-with-point-at-orig-entry): Add missing
  comma in the backquote template.

2 months agoorg-table: Fix radio tables containing macros
Nicolas Goaziou [Sat, 19 Sep 2015 11:25:12 +0000]
org-table: Fix radio tables containing macros

* lisp/org-table.el (orgtbl-to-generic): Export macros as-is, even if
  they are undefined.
* testing/lisp/test-org-table.el (test-org-table/to-generic): Add test.

Radio tables are now using a minimal set-up for export.  In particular,
no macro is expanded, and no Babel code is executed.  If any of these is
needed, use `org-export-string-as' or `org-export-region-as' instead.

Reported-by: Mark Edgington <>

2 months agoox-odt: Prevent internal links to target table of contents
Nicolas Goaziou [Fri, 18 Sep 2015 21:58:51 +0000]
ox-odt: Prevent internal links to target table of contents

* lisp/ox-odt.el (org-odt-toc): Ignore targets, links and footnote
  references from table of contents.

Reported-by: (Denis Bitouzé)

2 months agodoc/org.texi: Elide duplicate phrase
Joe Riel [Sat, 12 Sep 2015 21:23:42 +0000]
doc/org.texi: Elide duplicate phrase

* doc/org.texi (The export dispatcher): The phrase "from which it is
  possible to select an export format and to toggle export options."
  appeared both before and after the footnote.  Remove the redundancy.


2 months agodoc/org.texi: Add link to relevant chapter
Joe Riel [Sat, 12 Sep 2015 18:36:50 +0000]
doc/org.texi: Add link to relevant chapter

* doc/org.texi (Exporting code blocks): Add link to Exporting. Coming
  into this section without having read the chapter 12 is pretty
  confusing.  The link is helpful.


2 months agodoc/org.texi: Rewrite paragraph
Joe Riel [Sat, 12 Sep 2015 18:30:06 +0000]
doc/org.texi: Rewrite paragraph

doc/org.texi (Evaluating code blocks): Rewrite paragraph to state where
 to find information on enabling other languages.  Without this, it
 isn't clear where to look.


2 months agoorg-element: Fix short caption parsing
Nicolas Goaziou [Thu, 10 Sep 2015 15:55:26 +0000]
org-element: Fix short caption parsing

* lisp/org-element.el (org-element--collect-affiliated-keywords): Fix
  short caption parsing.

Reported-by: Suvayu Ali <>

2 months agoox-koma-letter: Allow to disable place locally
Nicolas Goaziou [Thu, 10 Sep 2015 12:21:49 +0000]
ox-koma-letter: Allow to disable place locally

* contrib/lisp/ox-koma-letter.el (koma-letter):
(org-koma-letter--build-settings): Allow to disable place locally.

Whenever OPTION keyword contains a "place" item or PLACE keyword is used
in the buffer, set KOMA option place after LCO inclusion.

Reported-by: Alan Schmitt <>

2 months agoorg-agenda: simplify one expression (refactoring)
Marco Wahl [Thu, 10 Sep 2015 11:54:28 +0000]
org-agenda: simplify one expression (refactoring)

* lisp/org-agenda.el (org-agenda-filter-by-category): replace '(and
  cat)' with the equivalent 'cat'.

2 months agoorg-agenda,org.texi: Fix doc about category filter
Marco Wahl [Thu, 10 Sep 2015 11:41:21 +0000]
org-agenda,org.texi: Fix doc about category filter

* lisp/org-agenda.el (org-agenda-filter-by-category): Documentation of
  the effect of the prefix argument.

* doc/org.texi (Filtering/limiting agenda items): Documentation about
  the effect of the prefix argument when filtering by category.

2 months agoob-tangle: Fix commenting links at column 0
Nicolas Goaziou [Thu, 10 Sep 2015 09:11:15 +0000]
ob-tangle: Fix commenting links at column 0

* lisp/ob-tangle.el (org-babel-spec-to-string): Ignore invisible
  characters when commenting in destination file.

* testing/lisp/test-ob-tangle.el (ob-tangle/comment-links-at-left-margin):
New test.

Reported-by: Rainer M Krug <>

2 months agoox: Ignore statistics cookies with stat:nil
Nicolas Goaziou [Thu, 10 Sep 2015 07:32:58 +0000]
ox: Ignore statistics cookies with stat:nil

* lisp/ox.el (org-export--prune-tree): Fix bug preventing pruning within
  secondary strings.

* testing/lisp/test-ox.el (test-org-export/handle-options): Update test.

Reported-by: Thomas S. Dye <>

2 months agoox: Fix OPTION keyword parsing
Nicolas Goaziou [Wed, 9 Sep 2015 20:50:08 +0000]
ox: Fix OPTION keyword parsing

* lisp/ox.el (org-export--parse-option-keyword): Handle multiple
  properties referring to the same option item.

* testing/lisp/test-ox.el (test-org-export/parse-option-keyword): Add

2 months agoMerge branch 'maint' of into maint
Nicolas Goaziou [Wed, 9 Sep 2015 14:15:23 +0000]
Merge branch 'maint' of into maint

2 months agoox-md: Fix 790bd64
Nicolas Goaziou [Wed, 9 Sep 2015 14:12:47 +0000]
ox-md: Fix 790bd64

* lisp/ox-md.el (org-md-link): Add missing "#".

2 months agoFix tangling in indirect buffers
Kyle Meyer [Wed, 9 Sep 2015 03:48:44 +0000]
Fix tangling in indirect buffers

* lisp/ob-tangle.el (org-babel-tangle-single-block): Get file name from
  base buffer.
(org-babel-tangle): Use file name from attribute list returned by

Reported-by: Rainer M Krug <>

2 months agoox-odt: Tiny fix
Nicolas Goaziou [Wed, 9 Sep 2015 12:30:41 +0000]
ox-odt: Tiny fix

* lisp/ox-odt.el (org-odt-link): No need to handle nil values for fuzzy

2 months agoox: Fix a docstring
Nicolas Goaziou [Wed, 9 Sep 2015 12:30:25 +0000]
ox: Fix a docstring

* lisp/ox.el (org-export-resolve-fuzzy-link): Return value cannot be

2 months agoox-md: Fix fuzzy link export
Nicolas Goaziou [Wed, 9 Sep 2015 12:04:36 +0000]
ox-md: Fix fuzzy link export

* lisp/ox-md.el (org-md-link): Fix fuzzy link export.

2 months agoorg-entities: Fix "infin" entity
Nicolas Goaziou [Mon, 7 Sep 2015 19:19:29 +0000]
org-entities: Fix "infin" entity

* lisp/org-entities.el (org-entities): Fix infin entity in LaTeX.

Suggested-by: Leandro Facchinetti <>

2 months agoMerge branch 'maint' of into maint
Nicolas Goaziou [Mon, 7 Sep 2015 17:12:20 +0000]
Merge branch 'maint' of into maint

2 months agoox: Do not check footnote validity when including files
Nicolas Goaziou [Mon, 7 Sep 2015 17:09:17 +0000]
ox: Do not check footnote validity when including files

* lisp/ox.el (org-export--update-footnote-label): Remove function.
(org-export--prepare-file-contents): Do not error when a footnote
definition cannot be found.

In particular, it should not throw an error when a footnote is not
defined outside of export scope.

Reported-by: Leonard Randall <>

2 months agoorg.el: Enhance docstrings
Bastien [Mon, 7 Sep 2015 14:59:13 +0000]
org.el: Enhance docstrings

* org.el (org-demote-subtree, org-do-demote)
(org-fix-position-after-promote): Enhance docstrings.

2 months agoox: Change internal tag for included footnotes
Nicolas Goaziou [Sun, 6 Sep 2015 20:14:47 +0000]
ox: Change internal tag for included footnotes

* lisp/ox.el (org-export--update-footnote-label):
(org-export--prepare-file-contents): Use a new naming scheme for
internal footnotes, less likely to introduce collisions.

The previous one introduced a collision between [1] and [fn:1].

2 months agoox: Fix footnotes in included files
Nicolas Goaziou [Sun, 6 Sep 2015 19:54:57 +0000]
ox: Fix footnotes in included files

* lisp/ox.el (org-export--prepare-file-contents): Do not error when
  including multiple footnotes with the same label.

* testing/lisp/test-ox.el (test-org-export/expand-include): Update test.

Reported-by: Leonard Randall <>

2 months agoFix property drawer regexp
Nicolas Goaziou [Fri, 4 Sep 2015 19:29:55 +0000]
Fix property drawer regexp

* lisp/org.el (org-property-drawer-re): Make sure regexp doesn't expand
  past other drawers.

2 months agoFix indentation when altering planning info
Nicolas Goaziou [Thu, 3 Sep 2015 21:03:28 +0000]
Fix indentation when altering planning info

* lisp/org.el (org-add-planning-info): Do not remove too much
  indentation when removing a planning line.
* testing/lisp/test-org.el: Add tests.

Reported-by: George McNinch <>

2 months agoox-html: Fix links with ampersands
Nicolas Goaziou [Wed, 2 Sep 2015 19:30:59 +0000]
ox-html: Fix links with ampersands

* lisp/ox-html.el (org-html-link): Escape ampersands and other special
  characters in anchor once and only once.

Reported-by: "Greedwolf DSS" <>

2 months agoox: Fix smart inner quotes
Nicolas Goaziou [Wed, 2 Sep 2015 19:02:41 +0000]
ox: Fix smart inner quotes

* lisp/ox.el (org-export--smart-quote-status): Fix inner smart quotes.
* testing/lisp/test-ox.el (test-org-export/activate-smart-quotes): Add

Reported-by: "T.F. Torrey" <>

2 months agoorg-element: Fix cache bug
Nicolas Goaziou [Tue, 1 Sep 2015 19:32:47 +0000]
org-element: Fix cache bug

* lisp/org-element.el (org-element-cache-reset): Avoid using
(org-element--cache-active-p): Check cache is properly initialized.

2 months agoorg-clock: Fix `org-clock-remove-empty-clock-drawer'
Nicolas Goaziou [Tue, 1 Sep 2015 08:29:33 +0000]
org-clock: Fix `org-clock-remove-empty-clock-drawer'

* lisp/org-clock.el (org-clock-drawer-name): New function.
(org-clock-find-position): Use new function.
(org-clock-remove-empty-clock-drawer): Remove drawer actually used for
clocks, which may be different from the one used for storing notes.
Also, consider that headlines could use different drawer names in the
same tree.

2 months agoorg-mime: Use `compose-mail' to send mail
Erik Hetzner [Sun, 30 Aug 2015 05:12:20 +0000]
org-mime: Use `compose-mail' to send mail

* contrib/lisp/org-mime.el (org-mime-compose): Use `compose-mail' to
send mail.  Allows customization via `mail-user-agent'.


2 months agoorg.texi: Fix typo
Jorge A. Alfaro Murillo [Tue, 25 Aug 2015 19:12:43 +0000]
org.texi: Fix typo

* doc/org.texi (Extracting source code): Fix typo.

2 months agoFix column view display when editing a property
Nicolas Goaziou [Wed, 26 Aug 2015 20:18:21 +0000]
Fix column view display when editing a property

* lisp/org.el (org-insert-property-drawer): Ensure insertion of new
  property drawer happens in current entry so as to not mess with next's

Reported-by: Dale <>

3 months agoox-html: Fix center block class
Rasmus [Tue, 25 Aug 2015 23:14:15 +0000]
ox-html: Fix center block class

* ox-html.el (org-html-center-block): Correct class.


3 months agoorg-indent: Remove extra column in indentation
Nicolas Goaziou [Tue, 25 Aug 2015 13:03:59 +0000]
org-indent: Remove extra column in indentation

* lisp/org-indent.el (org-indent-set-line-properties): Fix virtual
  indentation computation.

Reported-by: Eric S Fraga <>

3 months agoox: Fix uninterpreted data in captions
Nicolas Goaziou [Tue, 25 Aug 2015 11:59:03 +0000]
ox: Fix uninterpreted data in captions

* lisp/ox.el (org-export--remove-uninterpreted-data-1): Handle
  uninterpreted data in captions.

* testing/lisp/test-ox.el (test-org-export/uninterpreted): Add tests.

Reported-by: Johannes Rainer <>

3 months agoFix agenda follow mode to work with included diary
Matt Lundin [Mon, 24 Aug 2015 15:31:49 +0000]
Fix agenda follow mode to work with included diary

* lisp/org-agenda.el (org-agenda-goto): Fix function to work with
  non-Org buffers.  Otherwise `org-agenda-follow-mode' does not work
  correctly with included diary entries (e.g., it errors out while the
  cursor is still in the diary buffer).

Follow mode does not work with diary entries in the agenda.  It calls
`org-agenda-goto', which expects to be in an Org mode buffer but does not
test to make sure that it is in an Org buffer.  As a result, it errors
out midway through and leaves the cursor stranded in the diary buffer.

3 months agoorg-notify: Fix compatibility with latest org-element (uppercase properties)
Peter Münster [Mon, 24 Aug 2015 13:47:13 +0000]
org-notify: Fix compatibility with latest org-element (uppercase properties)

* contrib/lisp/org-notify.el (org-notify-make-todo): Properties from
  org-element are all uppercase now.
* (org-notify-maybe-too-late): Fix typo in docstring (thanks to davemq,