3 days agoClean up spacing to pass Emacs's pre-commit check maint
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.

3 days 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.

3 days 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.

3 days 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 <>

4 days 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.

4 days 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 <>

5 days 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 <>

5 days 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 <>

5 days 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.


6 days 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'.


11 days 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 <>

12 days 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.

13 days 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


13 days 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 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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 weeks 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 weeks agoorg-table: Silence byte-compiler
Nicolas Goaziou [Sat, 19 Sep 2015 14:36:26 +0000]
org-table: Silence byte-compiler

2 weeks 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 weeks 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 weeks 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é)

3 weeks 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.


3 weeks 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.


3 weeks 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.


3 weeks 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 <>

3 weeks 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 <>

3 weeks 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'.

3 weeks 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.

3 weeks 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 <>

3 weeks 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 <>

3 weeks 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

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

3 weeks 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 "#".

3 weeks 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 <>

3 weeks 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

3 weeks 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

3 weeks 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.

4 weeks 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 <>

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

4 weeks 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 <>

4 weeks 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.

4 weeks 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].

4 weeks 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 <>

4 weeks 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.

4 weeks 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 <>

4 weeks 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" <>

4 weeks 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" <>

5 weeks 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.

5 weeks 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.

5 weeks 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'.


5 weeks 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.

5 weeks 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 <>

6 weeks 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.


6 weeks 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 <>

6 weeks 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 <>

6 weeks 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.

6 weeks 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,

6 weeks agoorg-footnote-action: Handle nil context
Kyle Meyer [Mon, 24 Aug 2015 04:10:54 +0000]
org-footnote-action: Handle nil context

* lisp/org-footnote.el (org-footnote-action): Check whether context is
  non-nil before trying to move to the end of the element.

6 weeks agoox: Fix inheritance for EXPORT_... properties
Nicolas Goaziou [Sun, 23 Aug 2015 21:50:49 +0000]
ox: Fix inheritance for EXPORT_... properties

* lisp/ox.el (org-export--get-subtree-options):
(org-export-output-file-name): Let user control inheritance for these
properties instead of hard-coding (an inconsistent) behavior.

Reported-by: Eric Abrahamsen <>

6 weeks agoob: Fix RESULTS indentation
Nicolas Goaziou [Sun, 23 Aug 2015 21:38:36 +0000]
ob: Fix RESULTS indentation

* lisp/ob-core.el (org-babel-parse-src-block-match): Compute indentation
  taking into consideration tab width.
(org-babel-where-is-src-block-result): Do not assume indentation
consists of white space characters only.

* testing/lisp/test-ob.el (test-ob/preserve-results-indentation): Add

Reported-by: Jarmo Hurri <>

6 weeks agoFix COMMENT fontification
Nicolas Goaziou [Sun, 23 Aug 2015 20:45:27 +0000]
Fix COMMENT fontification

* lisp/org.el (org-set-font-lock-defaults): Fix regexp.

Reported-by: Martin Carlé <>

6 weeks agoRedo Agenda in more cases even in sticky mode
Nikolai Weibull [Thu, 20 Aug 2015 17:02:34 +0000]
Redo Agenda in more cases even in sticky mode

* org-agenda.el (org-agenda-maybe-redo): Test for
org-agenda-this-buffer-name as well.

The Agenda buffer will have a different name if it’s in sticky mode,
but some commands that alter the agenda should still redo it, for
example, org-agenda-remove-restriction-lock, just like
org-agenda-filter-by-category does.

6 weeks agoorg.texi: Fix typo
Kyle Meyer [Sat, 22 Aug 2015 20:51:42 +0000]
org.texi: Fix typo

* doc/org.texi (Clocking commands): Fix typo.

6 weeks agoBackport commit c1cacb0 from Emacs master branch
Kyle Meyer [Sat, 22 Aug 2015 20:51:38 +0000]
Backport commit c1cacb0 from Emacs master branch

* lisp/org-gnus.el (org-gnus-no-new-news):
Prefer (substitute-command-keys "`\\[foo-command]'")
to "`M-x foo-command'" in docstrings and the like.

Avoid hard-coding "M-x command" in docstrings
Paul Eggert
Fri Aug 21 14:09:47 2015 -0700

6 weeks agoorg-datetree: Fix DATE_TREE search
Nicolas Goaziou [Sat, 22 Aug 2015 19:40:54 +0000]
org-datetree: Fix DATE_TREE search

* lisp/org-datetree.el (org-datetree-find-date-create): Ignore case and
  discard false positives (e.g., a fake property in an example block).

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

6 weeks agoorg-capture: Fix bindings in header line
Nicolas Goaziou [Fri, 21 Aug 2015 22:54:14 +0000]
org-capture: Fix bindings in header line

* lisp/org-capture.el (org-capture-mode): Display currently used
  bindings in header line.

6 weeks agoorg-datetree: Fix datetree capture
Nicolas Goaziou [Fri, 21 Aug 2015 22:16:57 +0000]
org-datetree: Fix datetree capture

* lisp/org-datetree.el (org-datetree-add-timestamp): Clarify docstring.
(org-datetree-insert-line): Leave point on new entry.

6 weeks agoRevert "org-capture: Fix datetree capture"
Nicolas Goaziou [Fri, 21 Aug 2015 21:48:36 +0000]
Revert "org-capture: Fix datetree capture"

This reverts commit a834a5939fd7fa9b7184ebc0a4587a72916f907f.

6 weeks agoorg-capture: Fix datetree capture
Nicolas Goaziou [Fri, 21 Aug 2015 21:31:23 +0000]
org-capture: Fix datetree capture

* lisp/org-capture.el (org-capture-set-target-location): Fix
  file+datetree capture with non-nil `org-datetree-add-timestamp.

Reported-by: Gregor Zattler <>

6 weeks agoRevert "org.el: Add version header"
Rasmus [Fri, 21 Aug 2015 20:23:42 +0000]
Revert "org.el: Add version header"

This reverts commit 182552ee75bad48b062d3b0f7e8e9dce9c1b7965.

6 weeks agoorg-indent: Fix indentation in inline tasks
Nicolas Goaziou [Fri, 21 Aug 2015 12:44:26 +0000]
org-indent: Fix indentation in inline tasks

* lisp/org-indent.el (org-indent-add-properties): Indent inline tasks'
  contents according to current outline level, not inlinetask's.  This
  is consistent with hard indentation, using `org-indent-line'.

6 weeks agoFix typo
Nicolas Goaziou [Fri, 21 Aug 2015 12:07:26 +0000]
Fix typo

* lisp/org.el (org-open-at-point): Fix typo.

Reported-by: Sergei Nosov <>

6 weeks agoFix expansion of archived trees
Nicolas Goaziou [Fri, 21 Aug 2015 11:56:50 +0000]
Fix expansion of archived trees

* lisp/org.el (org-hide-archived-subtrees): Do not assume BEG is at
  beginning of line.  This matters when function is called with point in
  the middle of an archived headline.

Reported-by: Hymie! <>

6 weeks agoMerge branch 'fix-indent' into maint
Nicolas Goaziou [Thu, 20 Aug 2015 19:04:32 +0000]
Merge branch 'fix-indent' into maint

6 weeks agoFix f4d7646
Nicolas Goaziou [Thu, 20 Aug 2015 12:02:39 +0000]
Fix f4d7646

* lisp/org.el (org-deadline):
(org-schedule): Remove spurious argument.

6 weeks agoorg-indent: Fix indentation with proportional font
Nicolas Goaziou [Thu, 20 Aug 2015 11:58:00 +0000]
org-indent: Fix indentation with proportional font

* lisp/org-indent.el (org-indent-max):
(org-indent-stars): Remove unused variables.

(org-indent-initialize): Remove function.

(org-indent-boundary-char): Remove unnecessary comment.  Do not rely on
function above.

(org-indent): Make sure characters used for virtual indentation are
invisible since they are not necessarily white spaces.

(org-indent-set-line-properties): Fix indentation with proportional
font, i.e., do not use only white spaces to indent.
(org-indent-add-properties): Apply changes above.

Reported-by: Jakub Szypulka <>

6 weeks agoox-latex: Allow nil for `org-latex-hyperref-template'
Nicolas Goaziou [Wed, 19 Aug 2015 14:49:36 +0000]
ox-latex: Allow nil for `org-latex-hyperref-template'

* lisp/ox-latex.el (org-latex-hyperref-template): Allow nil value.  Make
  `org-latex-with-hyperref' an obsolete alias for the variable.


6 weeks agoRevert "ox-latex.el: Resurrect `org-latex-with-hyperref'"
Nicolas Goaziou [Wed, 19 Aug 2015 14:45:01 +0000]
Revert "ox-latex.el: Resurrect `org-latex-with-hyperref'"

This reverts commit 6f41105bd97c4a64272ec23493d9ae3ced4c4cbe.

6 weeks agoFix 93b73bd
Nicolas Goaziou [Wed, 19 Aug 2015 14:24:34 +0000]
Fix 93b73bd

* lisp/org-element.el (org-element-link-parser): Fix 93b73bd.

6 weeks agoFix new time logging upon rescheduling
Nicolas Goaziou [Wed, 19 Aug 2015 14:07:22 +0000]
Fix new time logging upon rescheduling

* lisp/org.el (org-deadline):
(org-schedule): Properly store new time so it is accessible using "%s"
in `org-log-note-headings'.

Reported-by: Malcolm Purvis <>

6 weeks agoFix translated link
Nicolas Goaziou [Wed, 19 Aug 2015 13:12:57 +0000]
Fix translated link

* lisp/org-element.el (org-element-link-parser): Call
  `org-link-translation-function' if required.
(org-element-link-interpreter): Build link from type and path instead of
simply pasting raw value.

* lisp/org.el (org-translate-link): Call parser to extract proper path
  and type.

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

Reported-by: Sergei Nosov <>

6 weeks agoFix `org-entry-properties' with default priority
Nicolas Goaziou [Wed, 19 Aug 2015 09:12:43 +0000]
Fix `org-entry-properties' with default priority

* lisp/org.el (org-entry-properties): When no priority is explicitly
  set, report `org-default-priority' instead.

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

6 weeks agoox-html: Rename `org-html-html5-fancy-p' to `org-html--html5-fancy-p'
Nicolas Goaziou [Wed, 19 Aug 2015 09:07:06 +0000]
ox-html: Rename `org-html-html5-fancy-p' to `org-html--html5-fancy-p'

* lisp/ox-html.el (org-html--html5-fancy-p): Renamed from
  `org-html-html5-fancy-p'.  Add docstring.
(org-html-special-block): Apply renaming.

As an internal function, it should follow the convention of double
hyphens in its name.

7 weeks agoox-latex.el: Resurrect `org-latex-with-hyperref'
Bastien [Tue, 18 Aug 2015 17:23:34 +0000]
ox-latex.el: Resurrect `org-latex-with-hyperref'

* ox-latex.el (latex): Resurrect :latex-hyperref-p.
(org-latex-with-hyperref): Resurrect.
(org-latex-template): Use :latex-hyperref-p.

* org.texi (Beamer specific export settings)
(@LaTeX{} specific export settings): Mention both
`org-latex-hyperref-template' and `org-latex-with-hyperref'.

Thanks to Scott Randby for raising this issue.

7 weeks agoorg.texi: Fix case of `results' header-arg node
Grant Rettke [Mon, 17 Aug 2015 23:56:06 +0000]
org.texi: Fix case of `results' header-arg node

* org.texi (Top, Specific header arguments, var)
(Results of evaluation): Lowercase "results".

7 weeks agoAdd function to better guard html5 exports
Eric Abrahamsen [Tue, 18 Aug 2015 00:42:35 +0000]
Add function to better guard html5 exports

* lisp/ox-html.el (org-html-html5-fancy-p): New function to check
  that we are exporting to HTML5 and that the user has requested
  fancy elements.
  (org-html--wrap-image, org-html-template, org-html-toc)
  (org-html-special-block): Use the new function.

7 weeks agoorg.el (org-occur): Match timestamps at the end of a headline
Bastien [Tue, 18 Aug 2015 09:53:45 +0000]
org.el (org-occur): Match timestamps at the end of a headline

* org.el (org-occur): Workaround to match timestamps at the
end of a headline.

7 weeks agoFix c6d9a4ec
Bastien [Mon, 17 Aug 2015 18:42:50 +0000]
Fix c6d9a4ec

* org.el (org-check-before-date, org-check-after-date): Save
match data.