3 days agoorg-archive.el: Add command to archive entries with timestamps before today master
Toby S. Cubitt [Fri, 17 Jan 2014 15:14:13 +0000]
org-archive.el: Add command to archive entries with timestamps before today

* lisp/org-archive.el (org-archive-all-old): archive all entries with
  timestamps prior to today.
  (org-archive-subtree): double prefix argument invokes
  (org-archive-all-matches, org-archive-all-done): factor out common
  code into org-archive-all-matches.

3 days agoMerge branch 'master' of
Nicolas Goaziou [Tue, 16 Dec 2014 22:55:56 +0000]
Merge branch 'master' of

3 days agoFix low-high estimates
Nicolas Goaziou [Tue, 16 Dec 2014 22:48:41 +0000]
Fix low-high estimates

* doc/org.texi (Column attributes): Emphasize estimates format.
  Document degenerate case of plain numbers.
* lisp/org-colview.el (org-columns-compute): Properly sum estimates.
(org-columns-string-to-number): Recognize estimates containing an
(org-estimate-mean-and-var, org-estimate-print): Allow numbers as
a degenerate case of estimates.

Reported-by: yary <>

3 days agoorg.el: Allow calendars to be in their own frame
Alan Schmitt [Thu, 11 Dec 2014 18:01:45 +0000]
org.el: Allow calendars to be in their own frame

* lisp/org.el (org-read-date): Create and delete frames if
`calendar-setup' is set to 'calendar-only.

3 days agoFix `org-hide-archived-subtrees'
Nicolas Goaziou [Tue, 16 Dec 2014 09:28:34 +0000]
Fix `org-hide-archived-subtrees'

* lisp/org.el (org-hide-archived-subtrees): Prevent an error when END
  argument doesn't match the end of a subtree.  Prevent false
  positives.  Also, archive tag is case-sensitive.

4 days agoFix 434103
Nicolas Goaziou [Mon, 15 Dec 2014 12:07:10 +0000]
Fix 434103

* lisp/org.el (org-log-into-drawer): Fix

5 days agoorg-table.el: org-table-recalculate is quieter
Nathaniel Flath [Wed, 12 Nov 2014 11:45:03 +0000]
org-table.el: org-table-recalculate is quieter

* lisp/org-table.el (org-table-recalculate): Removed message for start of
processing.  When ALL is t, messages are printed at most once per second.


5 days agoorg-table.el: org-table-recalculate early returns
Nathaniel Flath [Mon, 20 Oct 2014 01:04:31 +0000]
org-table.el: org-table-recalculate early returns

* lisp/org-table.el (org-table-recalculate): Add early return.


5 days agoMerge branch 'master' of
Nicolas Goaziou [Sun, 14 Dec 2014 17:28:18 +0000]
Merge branch 'master' of

5 days agoChange default value for `org-clock-into-drawer'
Nicolas Goaziou [Sun, 14 Dec 2014 17:22:31 +0000]
Change default value for `org-clock-into-drawer'

* lisp/org-clock.el (org-clock-into-drawer): Update docstring.  Change
  default value.
(org-clock-jump-to-current-clock): Properly find current clock drawer,
if any.
(org-clock-find-position): Tiny fix.
(org-clock-out): Properly check if clock and log drawers are the same.
(org-clock-find-position, org-clock-out,
(org-clock-remove-empty-clock-drawer): Use new function.

5 days agoFunction `org-log-into-drawer' returns a string or nil
Nicolas Goaziou [Sun, 14 Dec 2014 17:21:42 +0000]
Function `org-log-into-drawer' returns a string or nil

* lisp/org.el (org-log-into-drawer): Update docstring.  Function
  returns a string or nil, not t anymore.
(org-mode-flyspell-verify): Small refactoring.

5 days agoFixed version number
Marc-Oliver Ihm [Sun, 14 Dec 2014 16:23:37 +0000]
Fixed version number

5 days agoBugfixes in occur mode
Marc-Oliver Ihm [Sun, 14 Dec 2014 16:21:14 +0000]
Bugfixes in occur mode

5 days agoMerge branch 'maint'
Nicolas Goaziou [Sun, 14 Dec 2014 08:41:38 +0000]
Merge branch 'maint'


5 days agoob-core: Source blocks are case-insensitive maint
Nicolas Goaziou [Sun, 14 Dec 2014 08:39:08 +0000]
ob-core: Source blocks are case-insensitive

* lisp/ob-core.el (org-babel-map-src-blocks,
  org-babel-map-inline-src-blocks): Make sure to ignore case when
  looking for source blocks.

Reported-by: Christopher Genovese <>

5 days agoob-core: Tiny fix
Nicolas Goaziou [Sun, 14 Dec 2014 08:36:50 +0000]
ob-core: Tiny fix

* lisp/ob-core.el (org-babel-active-location-p): Use appropriate

5 days agoMerge branch 'maint'
Nicolas Goaziou [Sun, 14 Dec 2014 08:33:28 +0000]
Merge branch 'maint'

5 days agoorg-mime.el: Correct element matching regex
Jon Miller [Fri, 12 Dec 2014 20:27:49 +0000]
org-mime.el: Correct element matching regex

* org-mime.el (org-mime-change-element-style): Correctly capture the
  HTML element instead of partially.

Passing element of "p" would end up matching and altering "pre"
elements as well.  Need to properly anchor the regex to HTML elements.


5 days agoUse `org-log-into-drawer' in `org-log-beginning'
Eric Abrahamsen [Sun, 14 Dec 2014 06:38:34 +0000]
Use `org-log-into-drawer' in `org-log-beginning'

* lisp/org.el (org-log-beginning): Use existing function for
  discovering the log specification.

6 days agoMerge branch 'maint'
Nicolas Goaziou [Sat, 13 Dec 2014 21:57:35 +0000]
Merge branch 'maint'

6 days agoox-md: Correctly export footnote references
Nicolas Goaziou [Sat, 13 Dec 2014 21:55:45 +0000]
ox-md: Correctly export footnote references

* lisp/ox-md.el (md): Do not ignore footnote references.

Footnotes do not exist in Markdown syntax, but we can fallback on

Reported-by: Vasilij Schneidermann <>

6 days agotest-org-timer: Preserve Emacs 23 compatibility
Nicolas Goaziou [Sat, 13 Dec 2014 15:22:49 +0000]
test-org-timer: Preserve Emacs 23 compatibility

* testing/lisp/test-org-timer.el (test-org-timer/with-temp-text,
  test-org-timer/with-current-time): Use `letf' instead of `cl-letf'.

7 days agoorg-table: introduce an upper bound on `org-table-convert-region-max-lines'.
Aaron Ecay [Fri, 12 Dec 2014 04:51:57 +0000]
org-table: introduce an upper bound on `org-table-convert-region-max-lines'.

* lisp/org-table.el (org-table-convert-region-max-lines): New
(org-table-convert-region): Use it.

This is useful primarily for babel results.  If a large table-like
object is returned by a code block, this function will become bogged
down in trying to read it, and hang emacs (necessitating a C-g).  This
situation most commonly arises when a :results none header has been
omitted.  With the patch, the user will not experience a hang, but
rather an error message.

7 days agoorg-src: add a note about bogosity of read-only overlays
Aaron Ecay [Fri, 12 Dec 2014 04:48:27 +0000]
org-src: add a note about bogosity of read-only overlays

* lisp/org-src.el (org-src--make-source-overlay): Add a TODO comment.

7 days agoorg-src: fix two bugs
Aaron Ecay [Fri, 12 Dec 2014 04:34:35 +0000]
org-src: fix two bugs

* lisp/org-src.el (org-src--edit-buffer): Construe equality for
markers properly.
(org-edit-src-save): Place point properly when writing back changes.

Thanks to Vikas Rawal for reporting:

9 days agoox-beamer: Don’t auto-label allowframebreaks frames; beamer forbids it.
Aaron Ecay [Tue, 9 Dec 2014 06:14:54 +0000]
ox-beamer: Don’t auto-label allowframebreaks frames; beamer forbids it.

* lisp/ox-beamer.el (org-beamer--format-frame): Don’t give a label if
allowframebreaks” is set.

9 days agoorg-table: various small fixes
Aaron Ecay [Tue, 9 Dec 2014 06:12:39 +0000]
org-table: various small fixes

* lisp/org-table.el (org-table-rewrite-old-row-references): Rename function.
(org-table-eval-formula): Update caller.
(org-table--to-generic-cell): Fix typo in string constant.
(orgtbl-to-orgtbl): Properly respect params argument.

9 days agoorg-entities.el: Add safe predicates to defcustoms.
Aaron Ecay [Tue, 9 Dec 2014 06:10:49 +0000]
org-entities.el: Add safe predicates to defcustoms.

* lisp/org-entities.el (org-entities--user-safe-p): New function.
(org-entities-ascii-explanatory, org-entities-user): Add :safe predicates.

9 days agoob-latex: Use htlatex by default if available.
Aaron Ecay [Tue, 9 Dec 2014 06:06:28 +0000]
ob-latex: Use htlatex by default if available.

* lisp/ob-latex.el (org-babel-latex-htlatex): Set to “htlatex” by
(org-babel-execute:latex): Update to match new default.

9 days agoBugfix version 3.0.1 of org-index.el
Marc-Oliver Ihm [Wed, 10 Dec 2014 21:20:55 +0000]
Bugfix version 3.0.1 of org-index.el

10 days agoMerge branch 'maint'
Nicolas Goaziou [Tue, 9 Dec 2014 21:42:56 +0000]
Merge branch 'maint'

10 days agoorg.texi: Fix typos
Nicolas Goaziou [Tue, 9 Dec 2014 21:42:17 +0000]
org.texi: Fix typos

* doc/org.texi (Document preamble):
(Headings and sectioning structure): Fix typo.

10 days agoorg-src: allow `org-babel-edit-prep:.*' to mark region
Oleh Krehel [Tue, 9 Dec 2014 16:26:02 +0000]
org-src: allow `org-babel-edit-prep:.*' to mark region

* lisp/org-src.el (org-edit-src-code): Let `deactivate-mark' nil.


10 days agoorg-todo-yesterday: Ignore `org-use-effective-time'
Kyle Meyer [Mon, 8 Dec 2014 00:21:42 +0000]
org-todo-yesterday: Ignore `org-use-effective-time'

* lisp/org.el (org-todo-yesterday):
* lisp/org-agenda.el (org-agenda-todo-yesterday): Ignore global
`org-use-effective-time' value.

Otherwise, if `org-use-effective-time' being nil,
`org-extend-today-until' will not be considered, resulting in the
current time being used instead of 23:59 yesterday.

Reported-by: Nikolay Kudryavtsev <>

10 days agoorg-timer.el: Merge API for the two timers
Kyle Meyer [Sun, 7 Dec 2014 07:24:54 +0000]
org-timer.el: Merge API for the two timers

* lisp/org-timer.el (org-timer-stop): Support countdown timers in addition
to relative timers.

* lisp/org-timer.el (org-timer-cancel-timer): Remove function.

* lisp/org-timer.el (org-timer-pause-or-continue): Support countdown
timers in addition to relative timers.

* testing/lisp/test-org-timer.el: New file.

* doc/org.texi: Merge relative and countdown timer nodes.

Several previous issues are fixed with these changes.

- org-timer-set-timer and org-timer-cancel-timer did not reset
  org-timer-start-time after countdown completed.

- Because org-timer-start did not return org-timer-pause-time to nil,
  the modeline remained stuck at the paused time.

- When org-timer-start was called with a countdown timer, the modeline
  was updated for the new relative timer, but the countdown timer
  remained scheduled.

- When org-timer-pause-or-continue was called with a countdown timer
  running, the modeline was put in a paused state, but the countdown
  timer remained scheduled.

- When org-timer-stop was called with a countdown timer running, the
  timer was removed from the modeline, but the countdown timer remained

- When org-timer-set-timer was called with a paused relative timer, the
  relative timer was not reset properly (org-timer-pause-time was still
  non-nil) and the modeline remained in the paused state of the relative
  timer, even though the countdown timer was scheduled with

- Running org-timer-set-timer at the beginning of an empty buffer
  resulted in an args-out-of-range error (due to the org-get-at-eol

10 days agoorg-timer.el (org-timer): Recognize double prefix
Kyle Meyer [Mon, 1 Dec 2014 07:02:19 +0000]
org-timer.el (org-timer): Recognize double prefix

* lisp/org-timer.el (org-timer): Follow the behavior described in the
docstring for a double prefix argument.

10 days agoMerge branch 'maint'
Nicolas Goaziou [Tue, 9 Dec 2014 09:09:20 +0000]
Merge branch 'maint'

10 days agoorg.texi: Remove reference to `org-effort-property'
Nicolas Goaziou [Tue, 9 Dec 2014 09:07:46 +0000]
org.texi: Remove reference to `org-effort-property'

* doc/org.texi (Effort estimates): Remove `org-effort-property' from
  variables index since it is a defconst, not a defcustom anymore.

See also 20dcd061a51a8121ff958fc0edb5b7c52ba4e0e0.

11 days agotest-org-table: Fix spurious failure in older Emacsen
Achim Gratz [Mon, 8 Dec 2014 19:41:41 +0000]
test-org-table: Fix spurious failure in older Emacsen

* testing/lisp/test-org-table.el (test-org-table/field-formula-outside-table):
  Older Emaacsen throw an 'error instead of 'user-error.  Catch both
  condition names to avoid spurious test failures when that happens.

12 days agoFix multiple property drawers insertion with repeated tasks
Nicolas Goaziou [Sun, 7 Dec 2014 23:31:50 +0000]
Fix multiple property drawers insertion with repeated tasks

* lisp/org.el (org-add-log-setup): A property drawer may be inserted
  where the note is going to be added.  Make sure the note ends after
  the drawer.

Reported-by: Bradley M. Kuhn <>

12 days agoMerge branch 'maint'
Nicolas Goaziou [Sun, 7 Dec 2014 22:53:23 +0000]
Merge branch 'maint'

12 days agoorg.texi: Fix typo
Nicolas Goaziou [Sun, 7 Dec 2014 22:52:24 +0000]
org.texi: Fix typo

* doc/org.texi (Export settings): Add missing OPTIONS item.

Reported-by: Amitai Hoze <>

12 days agoNew command add, new structure of index table, many fixes and enhancements.
Marc-Oliver Ihm [Sun, 7 Dec 2014 14:18:11 +0000]
New command add, new structure of index table, many fixes and enhancements.

13 days agoMake Org future-proof
Nicolas Goaziou [Sat, 6 Dec 2014 23:01:29 +0000]
Make Org future-proof

* lisp/org.el (org-small-year-to-year): Do not hardcode 2037 as the
  last future year for Org.  Always foresee the next 30 years.

13 days agoox-html: Fix docstring
Nicolas Goaziou [Sat, 6 Dec 2014 21:28:19 +0000]
ox-html: Fix docstring

* lisp/ox-html.el (org-html-protect-char-alist): Fix docstring.

Reported-by: Marcin Borkowski <>

13 days agoMerge branch 'maint'
Nicolas Goaziou [Sat, 6 Dec 2014 21:11:05 +0000]
Merge branch 'maint'

13 days agoorg.texi: Small fix
Nicolas Goaziou [Sat, 6 Dec 2014 20:51:08 +0000]
org.texi: Small fix

* doc/org.texi (Matching tags and properties): Remove inaccurate
  sentence and footnote.

13 days agoorg.texi: Small fixes
Nicolas Goaziou [Sat, 6 Dec 2014 20:30:59 +0000]
org.texi: Small fixes

* doc/org.texi (Matching tags and properties): Fix typo.  Remove
  inaccurate paragraph.

13 days agoFix Sparse trees properties matches
Nicolas Goaziou [Sat, 6 Dec 2014 20:20:55 +0000]
Fix Sparse trees properties matches

* lisp/org.el (org-cached-entry-get): Matches against properties names
  are case-insensitive.

* testing/lisp/test-org.el (test-org/match-sparse-tree): New test.

Reported-by: Puneeth Chaganti <>

13 days agoUpdated org-drill to latest version.
Paul Sexton [Sat, 6 Dec 2014 18:00:03 +0000]
Updated org-drill to latest version.

2 weeks agoFix 6289d8e
Nicolas Goaziou [Fri, 5 Dec 2014 22:26:40 +0000]
Fix 6289d8e

* lisp/org.el (org-set-regexps-and-options): Do not ignore "^:nil"
(org--setup-collect-keywords): Fix docstring.

2 weeks agoorg.texi: Document `org-html-link-org-files-as-html'
Alan Schmitt [Wed, 3 Dec 2014 14:40:50 +0000]
org.texi: Document `org-html-link-org-files-as-html'

* doc/org.texi: Document `org-html-link-org-files-as-html' in the
"Links in HTML export" section.

2 weeks agoorg.texi: Fix typo
Nicolas Goaziou [Wed, 3 Dec 2014 21:01:27 +0000]
org.texi: Fix typo

* doc/org.texi (Adding export back-ends): Fix typo.

2 weeks agoorg.texi: Remove NOBLOCKING from special properties list
Nicolas Goaziou [Wed, 3 Dec 2014 20:44:03 +0000]
org.texi: Remove NOBLOCKING from special properties list

* doc/org.texi (Special properties): Remove NOBLOCKING.

Special properties are properties that can get their value from
somewhere else than a properties drawer.  This is not the case of
NOBLOCKING, which is always set through such a drawer.  Technically,
it is more a reserved property than a special one, per manual

2 weeks agoDo not blank a table cell after expanding a snippet
Nicolas Goaziou [Wed, 3 Dec 2014 20:36:15 +0000]
Do not blank a table cell after expanding a snippet

* lisp/org.el (org-self-insert-command): Do not blank a table cell if
  last command is `yas-expand'.

Thanks to Sébastien Vauban for reporting it.

2 weeks agoResurrect ^:{} option
Nicolas Goaziou [Wed, 3 Dec 2014 17:48:48 +0000]
Resurrect ^:{} option

* lisp/org.el (org-set-regexps-and-options,
  org--setup-collect-keywords): Check OPTIONS keywords for information
  about sub/superscript.

Reported-by: Thomas Holst <>

2 weeks agoFix custom timestamps during export
Nicolas Goaziou [Wed, 3 Dec 2014 16:09:43 +0000]
Fix custom timestamps during export

* lisp/org.el (org-translate-time): Remove function.
(org-timestamp-translate): Rewrite function so it doesn't use the one

* lisp/ox-ascii.el (org-ascii-clock, org-ascii-planning):
* lisp/ox-html.el (org-html-clock, org-html-planning, org-html-timestamp):
* lisp/ox-latex.el (org-latex-clock, org-latex-planning):
* lisp/ox-texinfo.el (org-texinfo-clock, org-texinfo-planning): Use
  `org-timestamp-translate' instead of `org-translate-time'.

* etc/ORG-NEWS: Document function removal.

Reported-by: Ian Barton <>

2 weeks agoorg-element: Interpret diary timestamps
Nicolas Goaziou [Wed, 3 Dec 2014 16:13:44 +0000]
org-element: Interpret diary timestamps

* lisp/org-element.el (org-element-timestamp-interpreter): Interpret
  diary timestamps.

2 weeks agoorg-clock: Fix clocking when `org-clock-into-drawer' is a number
Nicolas Goaziou [Wed, 3 Dec 2014 14:24:40 +0000]
org-clock: Fix clocking when `org-clock-into-drawer' is a number

* lisp/org-clock.el (org-clock-find-position): Check if
  `org-clock-into-drawer' is a number when inserting the first clock.

Reported-by: Rainer Stengele <>

2 weeks agoorg-timer: Fix `org-timer-stop'
Nicolas Goaziou [Tue, 2 Dec 2014 10:47:18 +0000]
org-timer: Fix `org-timer-stop'

* lisp/org-timer.el (org-timer-stop): Do not modify
  `org-timer-current-timer', which is related to countdown timer,
  a different feature.

2 weeks agoorg-timer: Fix "No running timer" error
Nicolas Goaziou [Tue, 2 Dec 2014 10:28:15 +0000]
org-timer: Fix "No running timer" error

* lisp/org-timer.el (org-timer-stop): Do not look after
  `org-timer-current-timer', which is a variable related to countdown
  timer, whereas the function is related to relative timer.

Reported-by: Randy Smith <>

2 weeks agoorg.texi: Document `org-table-blank-field'
Bastien Guerry [Mon, 1 Dec 2014 16:04:36 +0000]
org.texi: Document `org-table-blank-field'

* doc/org.texi: Document `org-table-blank-field'.

Thanks to Vicente Vera for suggesting this.

2 weeks agocontrib/lisp/ox-bibtex.el: Fix trailing whitespace
Bastien Guerry [Mon, 1 Dec 2014 15:52:47 +0000]
contrib/lisp/ox-bibtex.el: Fix trailing whitespace

2 weeks agocontrib/lisp/ox-bibtex.el: Fixup for Emacs < 24.3
Nicolas Berthier [Mon, 25 Aug 2014 14:01:20 +0000]
contrib/lisp/ox-bibtex.el: Fixup for Emacs < 24.3

* contrib/lisp/ox-bibtex.el (org-bibtex-process-bib-files): Avoid
using `file-name-base', only available since Emacs version 24.3.

2 weeks agoox-koma-letter.el (org-koma-letter-subject-format): Enhance docstring
Bastien Guerry [Mon, 1 Dec 2014 15:50:12 +0000]
ox-koma-letter.el (org-koma-letter-subject-format): Enhance docstring

* ox-koma-letter.el (org-koma-letter-subject-format): Enhance

2 weeks agoNew version of Org-Velocity
Paul M. Rodriguez [Sun, 26 Oct 2014 22:13:18 +0000]
New version of Org-Velocity

2 weeks agoorg.texi (TODO dependencies): Document the NOBLOCKING property
Bastien Guerry [Mon, 1 Dec 2014 14:52:30 +0000]
org.texi (TODO dependencies): Document the NOBLOCKING property

* org.texi (TODO dependencies): Document the NOBLOCKING

Thanks to James Harkins for reporting this.

2 weeks agoorg.el (org-add-planning-info): Remove spurious blank line
Bastien Guerry [Mon, 1 Dec 2014 14:36:40 +0000]
org.el (org-add-planning-info): Remove spurious blank line

* org.el (org-add-planning-info): Remove spurious blank line
left after "unclosing" an entry.

3 weeks agoORG-NEWS: Improve properties drawers repair function
Nicolas Goaziou [Fri, 28 Nov 2014 22:07:38 +0000]
ORG-NEWS: Improve properties drawers repair function

3 weeks ago`org-add-planning-info' need not be interactive
Nicolas Goaziou [Wed, 26 Nov 2014 23:21:03 +0000]
`org-add-planning-info' need not be interactive

* lisp/org.el (org-add-planning-info): Remove interactive status.  Fix

3 weeks agoPreserve indentation when modifying planning info
Nicolas Goaziou [Wed, 26 Nov 2014 23:07:20 +0000]
Preserve indentation when modifying planning info

* lisp/org.el (org-add-planning-info): Preserve indentation when
  modifying planning info.  Refactor code.

Thanks to Sébastien Vauban for suggesting the idea.

3 weeks agoErase `org-insert-labeled-timestamps-at-point'
Nicolas Goaziou [Wed, 26 Nov 2014 22:28:11 +0000]
Erase `org-insert-labeled-timestamps-at-point'

* lisp/org.el (org-insert-labeled-timestamps-at-point): Remove
(org-add-planning-info): Remove reference to removed variable.

* lisp/org-agenda.el (org-agenda-schedule, org-agenda-deadline):
  Remove reference to removed variable.

* etc/ORG-NEWS (Skipping): Document removal.

Org syntax assumes planning info line is always right below the
headline.  Setting this variable to anything but nil defeats that and,
as a consequence, produces invalid planning lines.

3 weeks agoorg-eww.el: Fix org-store-link for eww-mode
Marco Wahl [Wed, 26 Nov 2014 09:38:43 +0000]
org-eww.el: Fix org-store-link for eww-mode

* contrib/lisp/org-eww.el (org-eww-store-link): Depending on the Emacs
  version use the appropriate interface to store the url of an
  eww-mode buffer.

This patch fixes the org-store-link feature for eww-mode buffers for
Emacs 25.

3 weeks agoMerge branch 'maint'
Nicolas Goaziou [Tue, 25 Nov 2014 08:24:02 +0000]
Merge branch 'maint'

3 weeks agoorg.el: Improve accuracy of message
Karl Fogel [Mon, 24 Nov 2014 17:32:42 +0000]
org.el: Improve accuracy of message

* lisp/org.el (org-remove-file): Reword success message.

Before this change, when `org-remove-file' succeeded in removing a
file from `org-agenda-files', it would display this unduly alarming
message to the user: "Removed file:".  This made it seem as
though the file itself were removed from the filesystem, rather than
simply being delisted from `org-agenda-files'.

After this change, the message "Removed from Org Agenda list:"
is displayed instead, so the user will experience only the normal
level of panic involved in using Org Mode, not the increased panic
that results from thinking a file has been removed when it hasn't.


3 weeks ago`org-edit-special' edits export blocks
Nicolas Goaziou [Sun, 23 Nov 2014 23:05:32 +0000]
`org-edit-special' edits export blocks

* lisp/org.el (org-edit-special): Allow to edit export blocks.
* etc/ORG-NEWS: Document feature.

3 weeks agoorg-src: Fix docstring
Nicolas Goaziou [Sun, 23 Nov 2014 22:34:47 +0000]
org-src: Fix docstring

* lisp/org-src.el (org-src-ask-before-returning-to-edit-buffer): Fix
  docstring.  Move variable in appropriate section.

3 weeks agoFix failing test
Nicolas Goaziou [Sun, 23 Nov 2014 16:30:59 +0000]
Fix failing test

* lisp/org.el (org-indent-region): Fix failing test.

3 weeks agoorg-src: Unify source editing tools
Nicolas Goaziou [Sat, 22 Nov 2014 23:31:23 +0000]
org-src: Unify source editing tools

* lisp/org-src.el (org-src-strip-leading-and-trailing-blanklines,
  org-edit-src-force-single-line, org-edit-src-picture,
  org-edit-src-from-org-mode, org-edit-src-allow-write-back-p,
  org-edit-src-beg-marker, org-edit-src-end-marker,
  org-edit-src-overlay, org-edit-src-block-indentation,
  org-edit-src-saved-temp-window-config, org-edit-src-code-timer):
  Remove variables.
(org-src--allow-write-back-p, org-src--beg-marker,
org-src--block-indentation, org-src--code-timer, org-src--end-marker,
org-src--end-marker, org-src--from-org-mode, org-src--overlay,
org-src--saved-temp-window-config, org-src--type,
org-src--babel-info): New variables.

(org-src--construct-edit-buffer-name, org-src--edit-buffer,
org-src--source-buffer, org-src--get-lang-mode, org-src--coordinates,
org-src--goto-coordinates, org-src--element-contents-area,
org-src--make-source-overlay, org-src--on-element-p,
org-src--contents-for-write-back, org-src--edit-element,
org-edit-table.el, org-edit-export-block): New functions.
(org-edit-src-find-buffer, org-src-construct-edit-buffer-name,
org-src-tangle, org-src-in-org-buffer): Remove functions.

(org-edit-src-code, org-edit-fixed-width-region, org-edit-src-abort,
org-edit-src-save): Use new functions and variables.
(org-edit-src-exit): Use new functions and variables.  Change

* lisp/org.el (org-edit-special, org-indent-line, org-indent-region):
  Use new functions and variables.

* lisp/ob-core.el (org-babel-do-in-edit-buffer): Remove useless check.
(org-babel-expand-src-block): Apply signature change.

This patches resolves discrepancies between source editing tools and
globally simplifies process (auto-save feature, region
preservation...).  It introduces export block editing.  It also moves
internal variables and functions into an appropriate namespace and
delete some unused functions.

3 weeks agoorg-src: Remove unused functions and variables
Nicolas Goaziou [Tue, 11 Nov 2014 16:31:40 +0000]
org-src: Remove unused functions and variables

* lisp/org-src.el (org-edit-src-region-extra): Remove variable.
(org-edit-src-find-region-and-lang, org-edit-src-get-lang,
org-edit-src-get-label-format, org-edit-src-get-indentation,
org-src-fontify-block, org-src-fontify-buffer): Remove functions.

(org-src-font-lock-fontify-block): Remove reference to removed
function in docstring.

Remove all functions and variables related to parsing, which is now
delegated to org-element.el.  Also reorder a defcustom and
a declaration in the library.

4 weeks agoMerge branch 'maint'
Nicolas Goaziou [Fri, 21 Nov 2014 23:04:51 +0000]
Merge branch 'maint'

4 weeks agoob-js: Fix passing multiline variables
Peter Moresi [Tue, 18 Nov 2014 23:58:17 +0000]
ob-js: Fix passing multiline variables

* lisp/ob-js.el (org-babel-js-var-to-js): Replace newline characters
  with "\n" in strings.

Let's say I have a multi-line string stored in an example block.

I want to store my CSV in an example block.


I have a JavaScript function that accepts a string named 'csv' and passing in 'my-csv-data'.


When I expand the source block I end up with:

var csv="ColA,ColB,ColC

This will not execute correctly because JavaScript does not support newlines in strings.

What I want instead is:

  var csv="ColA,ColB,ColC\n  1,2,3\n  4,5,6";


4 weeks agoOpen outer link on nested links
Nicolas Goaziou [Thu, 20 Nov 2014 22:35:28 +0000]
Open outer link on nested links

* lisp/org.el (org-open-at-point): Open outer link on nested links.

* testing/lisp/test-org.el (test-org/open-at-point/inline-image): New

Suggested-by: Daniel Bausch <>

4 weeks agoorg-entities.el: Add parallel symbol
rasmus [Wed, 19 Nov 2014 13:47:15 +0000]
org-entities.el: Add parallel symbol

* org-entities.el (org-entities): Add parallel symbol.

From patch proposal by Brady Trainor.


4 weeks agoMerge branch 'maint'
Nicolas Goaziou [Tue, 18 Nov 2014 18:46:44 +0000]
Merge branch 'maint'

4 weeks agoorg-element: Fix 'search failed ":"' error
Nicolas Goaziou [Tue, 18 Nov 2014 18:44:46 +0000]
org-element: Fix 'search failed ":"' error

* lisp/org-element.el (org-element-context): Fix 'search failed ":"'
  error when point is on a blank line after a keyword.

* testing/lisp/test-org-element.el (test-org-element/context): Add

4 weeks agoTiny refactoring
Nicolas Goaziou [Tue, 18 Nov 2014 09:43:50 +0000]
Tiny refactoring

* lisp/org.el (org-entry-properties): Tiny refactoring.

4 weeks agoFix CATEGORY property retrieval
Nicolas Goaziou [Tue, 18 Nov 2014 09:27:45 +0000]
Fix CATEGORY property retrieval

* lisp/org.el (org-entry-properties): Fix returned CATEGORY property
  when no specific keyword is provided.

* testing/lisp/test-org.el (test-org/entry-properties): Add test.

4 weeks agoFix SCHEDULED property retrieval
Nicolas Goaziou [Tue, 18 Nov 2014 09:11:35 +0000]
Fix SCHEDULED property retrieval

* lisp/org.el (org-entry-properties): Fix storing SCHEDULED property
  when specific argument is not specified.

* testing/lisp/test-org.el (test-org/entry-properties): Add test.

Reported-by: Richard Lawrence <>

4 weeks agoFix order of TODO keywords with S-right
Nicolas Goaziou [Mon, 17 Nov 2014 16:41:31 +0000]
Fix order of TODO keywords with S-right

* lisp/org.el (org-set-regexps-and-options): Fix order of TODO
  keywords with S-right.

Thanks to Sébastien Vauban for reporting it.

4 weeks agoox-latex: Do not message "PDF file produced" for fragments
Nicolas Goaziou [Sun, 16 Nov 2014 16:58:11 +0000]
ox-latex: Do not message "PDF file produced" for fragments

* lisp/ox-latex.el (org-latex-compile): Do not message "PDF file
  produced" for fragments.

4 weeks agoFix `org-indent-line' on blank lines after a paragraph
Nicolas Goaziou [Sun, 16 Nov 2014 16:39:04 +0000]
Fix `org-indent-line' on blank lines after a paragraph

* lisp/org.el (org--get-expected-indentation): Properly compute
  expected indentation on blank lines after a paragraph.
(org-indent-line): Update docstring.

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

4 weeks agoorg-element: Fix docstring
Nicolas Goaziou [Sun, 16 Nov 2014 15:49:18 +0000]
org-element: Fix docstring

* lisp/org-element.el (org-element-lineage): Fix docstring.

4 weeks agoMerge branch 'maint'
Nicolas Goaziou [Sun, 16 Nov 2014 14:51:13 +0000]
Merge branch 'maint'

4 weeks agoFix `org-insert-heading'
Nicolas Goaziou [Sun, 16 Nov 2014 14:47:40 +0000]
Fix `org-insert-heading'

* lisp/org.el (org-insert-heading): Fix some corner case when point is
  in an invisible list.

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

Reported-by: Luke Crook <>

4 weeks agoORG-NEWS: Document `org-element-lineage'
Nicolas Goaziou [Sun, 16 Nov 2014 13:09:00 +0000]
ORG-NEWS: Document `org-element-lineage'

4 weeks agoFix `org-return'
Nicolas Goaziou [Sun, 16 Nov 2014 12:57:21 +0000]
Fix `org-return'

* lisp/org.el (org-return): Avoid false positives in function.

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

Thanks to Sébastien Vauban for reporting it.


4 weeks agoox: Deprecate `org-export-get-genealogy' for `org-element-lineage'
Nicolas Goaziou [Sun, 16 Nov 2014 12:27:34 +0000]
ox: Deprecate `org-export-get-genealogy' for `org-element-lineage'

* lisp/ox.el (org-export-collect-tree-properties,
  org-export-numbered-headline-p, org-export-get-tags,
  org-export-resolve-fuzzy-link, org-export-get-ordinal,
  org-export-get-parent-headline, org-export-get-parent-element,

* lisp/ox-ascii.el (org-ascii--current-text-width):

* lisp/ox-beamer.el (org-beamer--frame-level):

* lisp/ox-icalendar.el (org-icalendar-blocked-headline-p):

* lisp/ox-latex.el (org-latex-footnote-reference):

* lisp/ox-odt.el (org-odt--enumerate, org-odt-link--infer-description,
  org-odt-table): Use `org-element-lineage' instead of

4 weeks agoorg-element: Implement `org-element-lineage'
Nicolas Goaziou [Sun, 16 Nov 2014 12:13:52 +0000]
org-element: Implement `org-element-lineage'

* lisp/org-element.el (org-element-lineage): New function.

* testing/lisp/test-org-element.el (test-org-element/lineage): New

4 weeks agoorg-info: Throw an error when following an info link fails
Nicolas Goaziou [Sat, 15 Nov 2014 23:18:24 +0000]
org-info: Throw an error when following an info link fails

* lisp/org-info.el (org-info-follow-link): Throw an error instead of
  a message when search fails.