Merge branch 'maint'
Merge branch 'master' into next
Merge branch 'maint' of github.com:magit/magit into maint
Merge branch 'master' of github.com:magit/magit
Merge branch 'maint'
Merge branch 'master' into next
fix travix make targets
Merge branch 'maint'
Merge branch 'master' into next
fontify most magit `with' and `define' macros

In libraries that are part of Magit automatically add font-lock
keywords for macros like `magit-define-command' and
`magit-with-section'.  This can be turned off by setting
`magit-add-font-lock-keywords' to nil.
only translate ansi sequences to properties when needed

Only translate ansi control sequences to text properties when colored
git output was explicitly requested.  Previously this was done for all
git output and as a result e.g. `magit-show's output was corrupted
when the shown file contained such sequences.  Fixes #544.
magit-cmd-output: do not corrupt output

This fixes #544.  There is no reason why we would want to manipulate
git's output.  In the master and next branches something similar to
the code removed in this commit was used to have colorful graphs in
logs.  But doing it in `magit-cmd-output' was wrong and that has been
fixed in these branches also.
sanitize tests/run-tests.el

* don't use defvar when let is enough
* use built-in functions to create paths
* test whether dirs exist before adding to load-path
tests/run-tests.el: add /path/to/magit/../{mocker,cl-lib} to load-path

It is quite reasonable to expect the directories containing the
dependencies to be located in the same directory as the magit
directory is located in.  At least this is the case when manually
installing each package as a subdirectory of some "site-lisp"
directory.  Or when using submodules as I do.
Makefile: reduce output

Use the intended emacs command-line options instead of using
--eval FORM when the latter is not actually necessary.  When
it is necessary "pretty-print" FORM.
quiet byte-compiler
Fix bug where the wrong author info is used for committing

The author information is saved in the buffer-local variable 'process-environment' in
the log-edit buffer.
To reset its value, kill-local-variable must be called not after, but BEFORE
switching away from the log-edit buffer.

Otherwise, the old author information will be reapplied in the next commit that uses
the same log-edit buffer.
Add commit field for bypassing verification (--no-verify)

This new field toggles whether or not we will pass --no-verify to `git
commit'.

Default keybinding: C-c C-n
magit-cmd-output: do not corrupt output

This fixes #544.  There is no reason why we would want to manipulate
git's output.  In the master and next branches something similar to
the code removed in this commit was used to have colorful graphs in
logs, but in maint that isn't the case.
Merge pull request #641 from tarsius/maint

magit-cmd-output: do not corrupt output