contrib/lisp/htmlize.el: Upgrade to version 1.43
org.el: Add a 'htmlize-link text property to plain and bracket links

* org.el (org-activate-plain-links)
(org-activate-bracket-links): Add a new 'htmlize-link text
property, so that htmlize (> version 1.42) can linkify the
links.

Thanks to Hrvoje Nikšić for suggesting this.
Allow using an encrypted headline as a capture target.

* org-capture.el (org-capture-finalize): Maybe re-encrypt
the target headline if it was decrypted.
(org-capture-set-target-location): Maybe decrypt the target
headline.

* org-crypt.el (org-at-encrypted-entry-p): New function.

Thanks to Guilherme Gondim for suggesting this.
Merge branch 'maint'
org-agenda.el (org-agenda-todo-custom-ignore-p): Fix typo in docstring

* org-agenda.el (org-agenda-todo-custom-ignore-p): Fix typo in docstring.
Merge branch 'maint'
org-e-html: Fix some variables values, docstrings and customize types

* contrib/lisp/org-e-html.el (org-e-html-scripts): Fix default value.
(org-e-html-style-default): Small fix to indentation.
(org-e-html-content-div): Remove obsolete variable.
(org-e-html-toplevel-hlevel): Fix type.
(org-e-html-postamble-format, org-e-html-preamble-format): Fix
docstring and type.
org-e-html: Fix preamble and postamble

* contrib/lisp/org-e-html.el (org-e-html--build-preamble): Renamed
  from `org-e-html-preamble'.  Properly call user-provided preamble
  function when appropriate.  Refactor code.
(org-e-html--build-postamble): Renamed from `org-e-html-postamble.
  Properly call user-provided preamble function when appropriate.
  Refactor code.
(org-e-html-template): Small refactoring.
(org-e-html--translate): Use :html entries in `org-export-dictionary'
instead of :utf-8.
(org-e-html--build-meta-info): Renamed from `org-e-html-meta-info'.
Add docstring.
(org-e-html--build-style): Renamed from `org-e-html-style'. Add
docstring.
(org-e-html--build-mathjax-config): Renamed from
`org-e-html-mathjax-config'.  Add docstring.
org.texi (Column width and alignment): Fix typo

* org.texi (Column width and alignment): Fix typo.

Thanks to Erich Neuwirth for spotting this.
Merge branch 'maint'
Merge branch 'master' of orgmode.org:org-mode
Allow to specify the separator used in an outline path.

* lisp/org.el (org-format-outline-path): New argument SEPARATOR to
specify a string that is inserted between parts of the outline path.
(org-display-outline-path): New argument SEPARATOR, to specify a
string that is inserted between parts of the outline path.
org-capture.el: Add declarations and check is `org-crypt' is loaded (Fix commit ac6409fe)

* org-capture.el (org-at-encrypted-entry-p)
(org-encrypt-entry, org-decrypt-entry): Declare.
(org-capture-set-target-location): Check whether `org-crypt'
has been loaded.

Thanks to Mike McLean for reporting this.
Merge branch 'maint'
org-crypt.el (org-at-encrypted-entry-p): Fix bug when the check happens before the first headline

* org-crypt.el (org-at-encrypted-entry-p): Fix bug when
the check happens before the first headline.
Merge branch 'maint'
ob.el: Deprecate ":results wrap" in favor of ":results drawer"

* ob.el (org-babel-common-header-args-w-values)
(org-babel-insert-result): Deprecate ":results wrap" in favor
of ":results drawer".
* ob.el (org-babel-insert-result): Remove support for ":results org"

* ob.el (org-babel-insert-result): Remove support for
":results org".

The insertion of #+BEGIN_ORG was confusing.  You can either use
":results raw" to insert the raw results or ":results drawer" to
wrap them into a :RESULTS: ... :END: drawer.
Merge branch 'maint'
ob.el: Remove "org" the list of predefined values for the ":results" parameter

* ob.el (org-babel-common-header-args-w-values): Remove "org"
the list of predefined values for the ":results" parameter.

This complete the previous fix (commit 203e50b).