Revert "org-capture.el (org-capture-steal-local-variables): Don't steal `mark-active'"

This reverts commit ee5a88cd01cccc7b12422aebe6269bfeb444d387.
org-capture.el (org-capture-fill-template): Set `mark-active' to nil

* org-capture.el (org-capture-fill-template): Set
`mark-active' to nil.

TINYCHANGE
Merge branch 'maint'
org.el (org-refresh-stats-properties): Fix arithmetic error

* org.el (org-refresh-stats-properties): Fix arithmetic error.

Thanks to Gregor Zattler for reporting this.
org.el (org-refile-check-position): Remove unused user error

* org.el (org-refile-check-position): Remove unused user error.
Minor reformatting
org.texi (Global and local cycling): Fix ref

* org.texi (Global and local cycling): Use only @pxref{}, as
Texinfo will take care of referring to the correct Emacs
manual HTML location.
htmlxref.cnf: New file to let texi2html point at the correct Calc HTML manual
org-timer.el (org-timer-value-string): Always return a positive value

* org-timer.el (org-timer-value-string): Always return a
positive value.  Add docstring.
Merge branch 'maint'
ox-ascii: Tiny fix

* lisp/ox-ascii.el (org-ascii--current-text-width): Tiny fix.
Merge branch 'maint'
org-agenda.el (org-agenda-set-restriction-lock): Remove restriction lock before setting it

* org-agenda.el (org-agenda-set-restriction-lock): Remove
restriction lock before setting it.

This fixes a small bug: when restriction lock is active on a subtree
and C-c C-x < before the first headline, the new restriction is set to
the entire file, but the old one was still present.
Use string width in table field justification

org-table.el (org-table-justify-field-maybe): Use
`org-string-width' instead of `length' to calculate the visual
width of table cells.

This is useful for e.g. double-width charsets.
Improve table column narrowing with variable-width strings

org-table.el (org-table-align): Use `org-string-width'.

This aims at better guessing how wide a narrowed table column should
actually be.  This won't work perfectly with variable-width scripts,
as it still only narrows in full-column increments, but it's better
than before.
org.el (org-link-escape-chars): Remove ?\+ ?\; and ?\=

* org.el (org-link-escape-chars): Remove ?\+ ?\; and ?\=.

Thanks to Michael Weylandt for suggesting this.
org-agenda: Tiny fix

* lisp/org-agenda.el (org-agenda-format-item): Check if string isn't
  empty before searching for text properties.
org.el (org-sort-entries): Improve TODO entries sorting

* org.el (org-sort-entries): When sorting by TODO keywords,
put TODO entries first, then entries without a TODO keyword,
then DONE entries.

Thanks to Eric Abrahamsen for triggering this.
Merge branch 'master' of orgmode.org:org-mode
org-agenda.el (org-get-time-of-day): Don't return time string from within links

* org-agenda.el (org-get-time-of-day): Don't return time
string from within links.

Thanks to Thomas Morgan for reporting this.