org-e-ascii: Fix docstrings

* contrib/lisp/org-e-ascii.el (org-e-ascii-filter-headline-blank-lines,
  org-e-ascii-filter-paragraph-spacing): Fix docstrings.
org-e-ascii: Fix 1aae9d83bf664753f1a62fcba0c748c17ea06827

* contrib/lisp/org-e-ascii.el (org-e-ascii-filter-paragraph-spacing):
  Only apply variables to contiguous paragraphs.
mk/server.mk: (hopefully) correct generation of the package description vector

* mk/server.mk: Correct generation of the package description vector.
  Use empty list instead of nil and add the package type "tar".  With
  these changes a local copy of the package directory is recognized
  correctly.  Add local file variable to the package description files
  so that the byte compiler does not try to compile them.
Merge branch 'maint'
org.el (org-open-at-point): Don't follow timestamp within bracket links

* org.el (org-open-at-point): Don't follow timestamp within
bracket links.
org.el (org-display-inline-images): Search for #+ATTR within the current paragraph

* org.el (org-display-inline-images): Search for #+ATTR within
the current paragraph.
org-src.el (org-src-font-lock-fontify-block): Fix bug: don't fontify the last character

* org-src.el (org-src-font-lock-fontify-block): Fix bug: don't
fontify the last character.
org-src.el: Fix bug about C-c C-s'ing in the source editing window

* org-src.el (org-edit-src-code, org-edit-src-exit): Fix bug
about saving the source editing window with the default value
for `org-src-window-setup' (i.e. 'reorganize-frame).
ob.el (org-babel-insert-result): Comma-escape results inserted with ":results org"

* ob.el (org-babel-insert-result): Comma-escape results
inserted with ":results org".
Merge branch 'maint' of orgmode.org:org-mode into maint
Rename some functions and move some hooks.

* org.el (org-font-lock-hook, org-set-font-lock-defaults): Add
a docstring.
(org-display-inline-remove-overlay): Rename from
`org-display-inline-modification-hook'.
(org-speed-command-activate): Rename from
`org-speed-command-default-hook'.
(org-babel-speed-command-hook): Rename from
`org-babel-speed-command-activate'.

* org-agenda.el (org-agenda-update-agenda-type): Rename from
`org-agenda-post-command-hook'.
(org-agenda-mode): Use the new name.
(org-agenda-post-command-hook): Define as obsolete function.

* org-lparse.el (org-lparse): Temporarily activate the hooks
needed for the ODT conversion.
(org-lparse-preprocess-after-blockquote): Rename from
`org-lparse-preprocess-after-blockquote-hook'.
(org-lparse-strip-experimental-blocks-maybe): Rename from
`org-lparse-strip-experimental-blocks-maybe'.
(org-lparse-preprocess-after-blockquote-hook)
(org-lparse-strip-experimental-blocks-maybe-hook): Define as
obsolete functions.
Merge branch 'master' of orgmode.org:org-mode
Merge branch 'maint'
org.el (org-format-outline-path): Fix bug: add the separator string after the prefix

* org.el (org-format-outline-path): Fix bug: add the separator
string after the prefix.
Rebind `org-agenda-priority' to `C-c ," in agenda mode (`C-u C-c ,' now shows priority)

* org.el (org-priority): Use a new argument to show priority
instead of setting it.
(org-show-priority): New function to show priority both in
normal Org buffers and in Org Agenda buffers.
(org-speed-commands-default): Use "," as a speed command for
setting priority.

* org-agenda.el (org-agenda-mode-map): Bind
`org-agenda-priority' to `C-c ,' as it was before.
(org-agenda-show-priority): Delete.
(org-agenda-priority): Use a new argument to show priority
instead of setting it.

Thanks to Robert Horn for triggering this change.
Merge branch 'maint'
mk/server.mk: Use /elpa/ instead of /pkg/daily/
Merge branch 'maint'