org-irc: Silence byte-compiler

org-attach: Make `org-attach-directory' a safe variable

* lisp/org-attach.el (org-attach-directory): Add :safe keyword.

Merge branch 'maint'

Fix bug in HTML export of code blocks with starting blank lines

* lisp/ox-html.el (org-html-do-format-code): Preverse starting blank
  lines when splitting code lines (use `split-string' instead of
  `org-split-string').

  (org-html-fontify-code): Preserve starting blank lines in returned
  code string.

Merge branch 'maint'

Fix last commit

* lisp/org.el (org-org-menu): Fix last commit.

Merge branch 'maint'

Activate CDLatex entry in menu only if `cdlatex' is loaded

* lisp/org.el (org-org-menu): Activate CDLatex entry in menu only if
  `cdlatex' is loaded.

Fixes: 4068

Merge branch 'maint'

org.texi: Fix typo

* doc/org.texi (Global and local cycling): Fix typo.

Merge branch 'maint'

org-gnus: Silence byte-compiler

Fixes: 29329

Merge branch 'maint'

Revert the whole time zone mess

* lisp/org.el (org-time-string-to-time):
(org-time-string-to-seconds): Remove optional ZONE argument.
(org-2ft):
(org-check-before-date):
(org-check-after-date):
(org-check-dates-range):
(org-parse-time-string):
* lisp/org-clock.el (org-clock-get-sum-start):
(org-clock-out):
(org-clock-timestamps-change):
(org-clock-sum):
(org-clock-update-time-maybe):
* lisp/org-colview.el (org-columns--age-to-minutes): Apply change.
* testing/lisp/test-org-clock.el (org-test-clock-create-clock):
(test-org-clock/clocktable/scope):
* testing/lisp/test-org-colview.el (test-org-colview/columns-summary):
  Apply change.  Simplify tests to avoid daylight saving time issue.

Yet another tweak to fontification

* lisp/org.el (org-do-emphasis-faces): Handle properly asterisks at
  the beginning of line.

Revert "Fix headline fontification"

This reverts commit 5873d9912145fb19d00cfa47587f8e16c59da56a.

Merge branch 'maint'

Fix RET past the last column of a table

* lisp/org.el (org-return): Split the table before first column or
  after last one.
* lisp/org-table.el (org-table-next-row): Remove code handling split.

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

Merge branch 'maint'

Let `or-export-last-sibling-p' handle discontinuous headlines

* lisp/ox.el (org-export-last-sibling-p): Handle discontinuous
  headlines.
* testing/lisp/test-ox.el (test-org-export/last-sibling-p): Add test.

Fixes: 24836

Merge branch 'maint'

Call store link functions only once

* lisp/org.el (org-store-link): Call store link functions only once.

Fixes: 19914

Merge branch 'maint'

org.texi: Fix incorrect statement about dynamic blocks

* doc/org.texi (Capturing column view):
(The clock table): Correct statement.

Reported-by: Jorge Morais Neto <jorge13515@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-11/msg00429.html>

ORG-NEWS: Document new behavior of org-comment-dwim on headings

Preserve point when storing link in Gnus nnir groups

* lisp/org-gnus.el: (org-gnus-store-link) This fixes a similar issue
  as commit 84b329516efbe92ea5385f2aa2ad2779ab44b427, but for
  nnir search groups in gnus.

Merge branch 'maint'

Preserve position of point in gnus virtual group

* lisp/org-gnus.el: (org-gnus-store-link) Add a save-excursion to
  protect the position of point. Otherwise, when calling org-capture
  in an article with a virtual group, the point is moved and the
  region captured is incorrect.

Merge branch 'maint'

org-capture: Re-introduce history list per prompt

* lisp/org-capture.el (org-capture--prompt-history-table):
(org-capture--prompt-history): New variables.

(org-capture-fill-template): Handle history list per prompt.

Reported-by: Karl Eichwalder <ke@gnu.franken.de>
<http://lists.gnu.org/r/emacs-orgmode/2017-11/msg00251.html>

Make `org-comment-dwim' check if on a heading

* lisp/org.el (org-comment-dwim): If on a heading, comment the
  heading.

* testing/lisp/test-org.el: Add test.

TINYCHANGE

Merge branch 'maint'

Fix some tests

* testing/lisp/test-org.el (test-org/comment-dwim): Fix tests

Merge branch 'maint'

ob-core: Fix `org-babel-src-block-names'

* lisp/ob-core.el (org-babel-src-block-names): Do not change
  visibility or windows when called.

Merge branch 'maint'

ob-core: Fix last commit

* lisp/ob-core.el (org-babel-result-end): Add missing `example-block'
  result type.

Merge branch 'maint'

ob-core: Fix removal of elements after RESULTS

* lisp/ob-core.el (org-babel-result-end): Ignore elements that do not
  correspond to a valid result type (e.g., a headline).

Fixes commit 1d8126385cf979cfaade0e6a82040884bd6af56b.

Reported-by: Kaushal Modi <kaushal.modi@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2017-11/msg00384.html>

Merge branch 'maint'

Fix headline fontification

* lisp/org.el (org-do-emphasis-faces): Do not emphasize stars in
  headlines.

Reported-by: swflint@flintfam.org (Samuel W. Flint)
<http://lists.gnu.org/r/emacs-orgmode/2017-11/msg00363.html>

Merge branch 'maint'

Backport commit a89f0b6f3 from Emacs

maint: shorten https://lists.gnu.org/archive/html/... links
a89f0b6f33f9eb8910a1fceda9028d76ef50b05d
Paul Eggert
Sat Nov 25 22:48:12 2017 -0800

Merge branch 'maint'

Silence byte-compiler

ox-html: Fix last commit

* lisp/ox-html.el (org-html-link): Fix last commit.

Do not save target buffer after archiving subtree

* lisp/org-archive.el: (org-archive-subtree) Do not save buffer after
  each archive.  Saving the archive buffer after archiving each
  subtree results in substantial slowdown and many writes to disk when
  archiving an active region.  This brings the behavior of
  org-archive-subtree into line with org-refile, which does not save
  the target buffer after refiling.

Do not save target buffer after archiving subtree

* lisp/org-archive.el: (org-archive-subtree) Do not save buffer after
  each archive.  Saving the archive buffer after archiving each
  subtree results in substantial slowdown and many writes to disk when
  archiving an active region.  This brings the behavior of
  org-archive-subtree into line with org-refile, which does not save
  the target buffer after refiling.

ox-publish: Fix resolving url-encoded external links

* lisp/ox-publish.el (org-publish-resolve-external-link): Handle
  url-encoded links.  Do not ask to create a new headline if none is
  found.

Merge branch 'maint'

Fix publishing links to absolute file names belonging to project

* lisp/ox-publish.el (org-publish-file-relative-name): New function.
* lisp/ox-html.el (org-html-link): Use new function.

* testing/lisp/test-ox-publish.el (test-org-publish/file-relative-name):
  New test.

Merge branch 'maint'

ob-core: Fix results removal without blank line between source and results

* lisp/ob-core.el (org-babel-remove-result): Delete blank lines before
  results.
(org-babel-result-end): Use `org-element-at-point'.
* testing/lisp/test-ob.el (test-ob-verify-result-and-removed-result):
  Remove duplicate.
* testing/lisp/test-ob.el (test-ob/org-babel-remove-result--no-blank-line):
  New test.
* testing/lisp/test-ob.el (test-ob/results-in-narrowed-buffer): Small
  refactoring.

Reported-by: Ken Mankoff <mankoff@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00338.html>

Merge branch 'maint'

Small fix to emphasis fontification

* lisp/org.el (org-do-emphasis-faces): Do not span over paragraph
  separators.

Reported-by: Kaushal Modi <kaushal.modi@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00202.html>

Merge branch 'maint'

Fix cross-references from %-encoded links in publishing

* lisp/ox-publish.el (org-publish-resolve-external-link): Decode
  search string.

Reported-by: Martin Hans <martinhansdk@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00328.html>

org-macro: Silence byte-compiler

org-macro: Implement "keyword" macro

* lisp/org-macro.el (org-macro-initialize-templates): Implement
  "keyword" macro.
* doc/org.texi (Macro replacement): Document new macro.

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

Remove second pass for macro expansion

* lisp/org-macro.el (org-macro-initialize-templates): Initialize all
  macros, including {{{title}}} and al.
(org-macro-replace-all): Change signature.
(org-macro--find-keyword-value): New function.
* lisp/ox.el (org-export-as): Remove second macro expansion

ox: Allow a less strict UNNUMBERED inheritance

* lisp/ox.el (org-export-collect-headlines):
(org-export-excluded-from-toc-p): Allow to number headlines in the
middle of an otherwise unnumbered tree.

* testing/lisp/test-ox.el (test-org-export/collect-headlines):
(test-org-export/excluded-from-toc-p):
(test-org-export/toc-entry-backend): Update tests.  Add more tests.

Reported-by: Akater <nuclearspace@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00219.html>

Merge branch 'maint'

org.texi: Fix typo

* doc/org.texi (Export settings): Fix typo introduced in last commit.

Merge branch 'maint'

ox: Fix UNNUMBERED strict inheritance

* lisp/ox.el (org-export-numbered-headline-p): Use a less opinionated
  definition of inheritance.

* testing/lisp/test-ox.el (test-org-export/numbered-headline-p):
  Update test.

* doc/org.texi (Export settings): Insist on UNNUMBERED inheritance.

It is now possible to number a headline within an unnumbered tree.

org-table: Insert new column to the right instead of the left

* lisp/org-table.el (org-table-insert-column): Insert new column to
  the right instead of the left.

* testing/lisp/test-org-table.el (test-org-table/insert-column): New
  test.

Merge branch 'maint'

org-table: Better fix for `:org-untouchable'

* lisp/org-table.el (org-table-recalculate): Fix typo in existing
  `remove-text-properties' call instead of adding a new one.

Also, cleaning property before processing formulas is more robust,
e.g., if last process raised an error.

Merge branch 'maint'

org-macs: Fix typos in docstrings

* lisp/org-macs.el (org-split-string):
(org-string-width): Fix typo in docstring.

Merge branch 'maint'

Fix `org-string-display'

* lisp/org-macs.el (org-string-display): Preserve original string's
  display property when computing displayed width.

* testing/lisp/test-org-macs.el (test-org/string-display): Add test.

Reported-by: Ruy Exel <ruyexel@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00160.html>

ox-ascii: Lighten numbering in table of contents

* lisp/ox-ascii.el (org-ascii--build-title): Use only last number in
  headline numbering when building table of contents.

Merge branch 'maint'

org-table: Clean left-over `:org-untouchable' property

* lisp/org-table.el (org-table-recalculate): Clean `:org-untouchable'
  property once we no longer need it.

* testing/lisp/test-org-table.el (test-org-table/formula-priority):
  New test.

Reported-by: Ruy Exel <ruyexel@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00159.html>

org-attach,test-org-attach: Refactoring.

* lisp/org-attach.el (org-attach-dired-to-subtree): Renamed from
  `org-attach-dired-attach-to-next-best-subtree'.  Convenience
  functions have been dropped.

* testing/lisp/test-org-attach.el: Tests use
  `org-test-with-temp-text-in-file' now and are cleaner now.

org-attach: Refactor. Replace self made with available function.

* lisp/org-attach.el (org-attach-dired-marked-files-or-file-at-cursor-in-dired)
  (org-attach-dired-marked-files-in-dired): Removed.  Use
  `dired-get-marked-files' instead.

org-attach: Attach files specified in a dired buffer.

* lisp/org-attach.el (org-attach-attach-files): New.
(org-attach-dired-marked-files-in-dired): New
(org-attach-dired-marked-files-or-file-at-cursor-in-dired): New.
(org-attach-dired-attach-to-next-best-subtree): New command.
(org-attach-dired-attach-to-next-best-subtree-cp): New command.
(org-attach-dired-attach-to-next-best-subtree-mv): New command.
(org-attach-dired-attach-to-next-best-subtree-ln): New command.
(org-attach-dired-attach-to-next-best-subtree-lns): New command.
* testing/lisp/test-org-attach.el: Tests.

Merge branch 'maint'

Backport commit 98288ecaf from Emacs

* lisp/org-clock.el (org-clock--oldest-date): Fix an issue when
compiling on macOS 10.6 with a western time zone (a continuation of
Bug#27736).

Further workaround for faulty localtime() under macOS 10.6
98288ecaffbc0947ec3193088172ea85ad5e42a5
Charles A. Roelli
Wed Nov 8 20:51:48 2017 +0100

Merge branch 'maint'

ox-html: Allow disabling htmlize

* lisp/ox-html.el (org-html-fontify-code): Do it.

Disable htmlize by setting org-html-htmlize-output-type to nil.

TINYCHANGE

Merge branch 'maint'

Add CS export translations

* lisp/ox.el (org-export-dictionary): Add translations for CS.

TINYCHANGE

Merge branch 'maint'

org-attach: Fix handling of ATTACH tag at sychronize

* lisp/org-attach.el (org-attach-sync): Remove ATTACH tag at
  synchronize when no files left.

Implement :pre-blank property for items and footnotes definitions

* lisp/org-element.el (org-element-footnote-definition-parser):
(org-element-item-parser): Add `:pre-blank' property.
(org-element-footnote-definition-interpreter):
(org-element-item-interpreter):
(org-element-interpret-data):
* lisp/ox.el (org-export-data): Use new property.
* testing/lisp/test-org-element.el (test-org-element/footnote-definition-parser):
(test-org-element/item-parser): Add tests.

v5.7.2 of org-index

Merge branch 'maint'

ox-ascii: Small fix to items that do not start with a paragraph

* lisp/ox-ascii.el (org-ascii-item): Use better heuristics to
  determine if contents should follow bullet or start a new line.

Contents follow bullet when the first contributing line is
a paragraph.  As a consequence, the following snippet

    -
      #+html: ...
      This is a paragraph.

is exported as

    - This is a paragraph.

instead of

    -
      This is a paragraph.

previously.

ORG-NEWS: Document user-visible changes with new template system

Merge branch 'maint'

ox-ascii: Fix descriptive lists

* lisp/ox-ascii.el (org-ascii-quote-margin): Update docstring.
(org-ascii--current-text-width): Properly handle width of text within
nested plain-list items.
(org-ascii-item): Always start a new line for description contents.
Indent them by `org-ascii-quote-margin' characters.

ox-texinfo: Gracefully handle node collision in the same hierarchy

* lisp/ox-texinfo.el (org-texinfo--get-node): Ensure the upper element
  get the shorter node.

Considering the following document:

* Headline
** Headline

the level 1 headlines get "Headline" node and the other one
"Headline (1)".

ox-texinfo: Preserve target name as node.

* lisp/ox-texinfo.el (org-texinfo--get-node): Use target's value as
  base for the node name, instead of using `org-export-get-reference'.

Replace easy templates with org-insert-structure-template

* lisp/org.el (org-insert-structure-template): New function for
  wrapping region (or element at point) in a begin/end block.
  (org-structure-predefined-blocks): New option holding predefined
  blocks, for completion.
  (org-try-structure-completion,
  org-complete-expand-structure-template): Remove functions.
* doc/org.texi (Inserting structure templates): Document.
* testing/lisp/test-org.el (test-org/insert-template): New test.

Merge branch 'maint'

Fix characters conversion issue when loading `org-id-locations-file'

* lisp/org-id.el (org-id-locations-load): Use `insert-file-contents'
  instead of `insert-file-contents-literally'.

Reported-by: Anders Johansson <mejlaandersj@gmail.com>
<http://lists.gnu.org/archive/html/emacs-orgmode/2017-11/msg00037.html>

Merge branch 'maint'

org-element: Fix item parser

* lisp/org-element.el (org-element--list-struct): Correctly handle end
  of sub-lists and end of last item.

* testing/lisp/test-org-element.el (test-org-element/item-parser):
(test-org-element/plain-list-parser): Add tests.