ox-freemind: Fix code typo

* contrib/lisp/ox-freemind.el (org-freemind--build-node-contents): Fix
  code typo.
org-element: Do not url-decode parsed links

* lisp/org-element.el (org-element-link-parser): Do not url-decode
  parsed links.

The function now assumes link at point is correctly encoded if needed.
`org-insert-link' already automatically url-encode generated links,
and link types not handled by this function (e.g., custom-id links) do
not need such encoding.
Merge branch 'maint'
org-contacts: Ensure contacts cache is updated if it contains markers with no buffer

* contrib/lisp/org-contacts.el (org-contacts-db-need-update-p):
Check if org-contacts-db cache contains markers with no buffer as well, when
determining if cache should be updated from files.

The function `org-contacts-db-need-update-p' does two checks to determine if the
contacts cache should be updated:
1. If the variable `org-contacts-last-update' is nil.
2. If modification time of any file containing contacts is more recent than
   timestamp recorded in `org-contacts-last-update'.

There is another case where an update is required: when marker objects contained
in the contact cache `org-contacts-db' suddenly point to no buffer. If a buffer
containing contacts is killed, but underlying file is not modified, org-contacts
will not detect this, and cached markers that pointed to the now killed buffer
will become "dead" (e.g. have no buffer associated with them). This seems to cause
problems for instance in `org-contacts-anniversaries', which if used as diary
sexp in agenda file, will cause "Bad sexp" errors.
org-element: Fix infloop when parsing a list at the end of buffer

* lisp/org-element.el (org-element-plain-list-parser): Fix infloop
  when parsing a list at the end of buffer, if buffer doesn't end at
  a line beginning.
* testing/lisp/test-org-element.el: Add test.
Merge branch 'maint'

Conflicts:
	testing/lisp/test-org-element.el
ox: Multiple options can be set through the same keyword

* lisp/ox.el (org-export--get-inbuffer-options): Multiple options can
  now be set through the same buffer keyword.
* testing/lisp/test-ox.el: Add test.
ox: Fix small bug

* lisp/ox.el (org-export--get-inbuffer-options): Fix small bug
  introduced in 908d42c9b68257ed122073b29d7ada02b3d120fa.
org.texi (Advanced configuration): Fix typo

* org.texi (Advanced configuration): Fix typo.

Thanks to Bart Bunting for reporting this.
Merge branch 'maint'
contrib/lisp/ox-rss.el: Explain :RSS_PERMALINK:

* ox-rss.el: Explain :RSS_PERMALINK:.
(org-rss-headline): Make use of :RSS_PERMALINK: to specify the
permalink for a headline.
Merge branch 'maint'
ox.el: Remove reference to the obsolete variable `org-export-language-setup'

* ox.el: Remove reference to the obsolete variable
`org-export-language-setup'.
Merge branch 'maint'
contrib/lisp/ox-rss.el (org-rss-headline): Fix permalink concatenation

* ox-rss.el (org-rss-headline): Fix permalink concatenation.
(org-rss-headline, org-rss-build-channel-info): Use the
property :input-file from the info channel instead of
`buffer-file-name'.

Thanks to Nicolas for suggesting the latter fix.
Merge branch 'maint'
Fix indentation after a list

* lisp/org.el (org-indent-line): Fix indentation after a list.
Merge branch 'maint'
Missing backtick in =`ox-koma-letter.el'=

* ox-koma-letter.el (org-koma-letter-plug-into-ox): Add a
backtick.
delete colnames/rownames for replaced variables

  Thanks to Rick Frankel for help debugging this problem.

* lisp/ob-core.el (org-babel-merge-params): When merging parameters, if
  a variable is replaced with a new value, then delete colnames/rownames
  for the original value of that variable.