Fix missing syntax highlighting with #+SETUPFILE

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

Reported-by: Kyle Meyer <kyle@kyleam.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/92208>
org.texi: Remove reference to deleted command

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

* lisp/org.el (org--setup-collect-keywords): Fix infloop when parsing
  multiple tags.

Reported-by: Kyle Meyer <kyle@kyleam.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/92245>
Fix "Symbol nil may not be buffer-local" error

* lisp/org.el (org-set-regexps-and-options): Fix "Symbol nil may not
  be buffer-local" error when encountering an nonexistent startup
  keyword.

Reported-by: Mike McLean <mike.mclean@pobox.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/92279>
org.el (org-adapt-indentation): Fix typo

* lisp/org.el (org-adapt-indentation): Fix typo in docstring.
Merge branch 'maint'
org-capture.el: Fix expand template order

* lisp/org-capture.el (org-capture-fill-template): Expand %(sexp) after
  %:keywords, per documentation about capture templates expansion.

When a template is expanded first the simple %-escapes, %:keywords and
after that the %(sexp).

TINYCHANGE
Merge branch 'maint'
ox-md: Enforce blank line between paragraph and plain list

* lisp/ox-md.el (org-md-separate-elements): Enforce blank line between
  paragraph and plain list.

Suggested-by: Charles C. Berry <ccberry@ucsd.edu>
<http://permalink.gmane.org/gmane.emacs.orgmode/92321>
Merge branch 'maint'
org.texi: Remove outdated footnote

* doc/org.texi (Effort estimates): EFFORT property is a defconst.  It
  is not desirable to change it.
Merge branch 'maint'
Allow "min" modifier in effort durations

* lisp/org.el (org-effort-durations): Allow "min" modifier.

This is a standard abbreviation.  It also improves compatibility with
other programs using this property (e.g. "Taskjuggler").
Update some defcustoms keywords

* lisp/org.el (org-structure-template-alist): Fix :version keyword
  value.
(org-effort-durations): Add missing keywords.
Fix menu entries: Move Subtree Up/Down

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

`org-shiftmetaup' and `org-shiftmetadown' only drag a single line up
or down.  They are not about structure editing.

Reported-by: James Harkins <jamshark70@qq.com>
<http://permalink.gmane.org/gmane.emacs.orgmode/92299>
org-goto: Update for isearch changes

* lisp/org.el (org-goto): Update for isearch changes that removed
isearch-other-control-char.

isearch-other-control-char has been removed from isearch.el [1]. The
default interface for org-goto uses isearch-other-control-char to pass
certain key presses from org-goto-local-auto-isearch-map to
org-goto-map. Specifically, 'C-i' calls org-cycle and 'C-m' calls
org-goto-ret.

With the current isearch, the keys that should be passed to org-goto-map
can be set to nil. In addition to 'C-i' and 'C-m', RET must also be set
to nil because isearch-mode-map sets both 'C-m' and RET.

[1] bzr revision 114586, git commit aa04ac2c6,
    http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15200

<http://thread.gmane.org/gmane.emacs.orgmode/92317>
Merge branch 'maint'
Make org-transpose-words use text-mode-syntax-table

* lisp/org.el (org-mode-transpose-word-syntax-table): Make this table
  inherit from `text-mode-syntax-table'.
Update `customize-package-emacs-version-alist'

* lisp/org.el (customize-package-emacs-version-alist): Update value.
org-agenda: Switch to current API for two calendar calls

* lisp/org-agenda.el (org-agenda-phases-of-moon, org-agenda-holidays):
  Update to use the current API

This commit fixes the display of holidays in the agenda for emacs 25.

Further for getting the lunar phases the usage of an obsolete alias
has been replaced by the current name.