Fix left-over merge conflict
ox-koma-letter: Use `org-koma-letter-use-title'

* contrib/lisp/ox-koma-letter.el (org-koma-letter-template): Use
  `org-koma-letter-use-title'.  Small refactoring.
ox-koma-letter: Reorder "SUBJECT" in template
Merge branch 'maint'
Merge branch 'maint'
Merge branch 'maint'

Conflicts:
	doc/org.texi
Merge branch 'maint'
New function to toggle fixe-width areas

* lisp/org.el (org-toggle-fixed-width): New function.
* testing/lisp/test-org.el (test-org/toggle-fixed-with): New test.

This replaces the old implementation removed in commit
6a00c96541a2a01c08fbeeaf96e552683d9c3163.
initial support for Coq code blocks
fix bug when results butt up against headline

* lisp/ob-core.el (org-babel-examplize-region): Don't treat
  exampleized regions adjoining headlines as inline examples.
Merge branch 'maint'
Allow to turn on fixed-width marker on comment lines

* lisp/org.el (org-toggle-fixed-width): Allow to turn on fixed-width
  marker on comment lines.
ob-core.el: Some renaming.

* ob-core.el (org-babel-insert-result): Use `org-babel-examplify-region'.
(org-babel-capitalize-examplize-region-markers): Rename to
`org-babel-capitalize-example-region-markers'.
(org-babel-examplize-region): Mark obsolete and rename to
`org-babel-examplify-region'.
Merge branch 'maint'
Merge branch 'maint'
org-feed.el: Add config variant for current buffer

* lisp/org-feed.el (org-feed-alist): When FILE is nil the target
becomes the current buffer each time the feed update is invoked.
Merge branch 'maint'
add :cmdline support to shell code blocks

* lisp/ob-shell.el (org-babel-execute:shell): Pass the cmdline header
  argument to `org-babel-sh-evaluate'.
  (org-babel-sh-evaluate): Pass the cmdline header argument to
  `call-process-shell-command'.
Merge branch 'maint'
Merge branch 'maint'