master updated (3e13433 -> dc0f1ed)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  3e13433   ; Improve the last change in NEWS.
       new  b2164df   ; More stylistic docfixes in vc/*.el found by checkdoc
       new  4dcbdb9   Make doc argument of ediff-defvar-local optional
       new  e0726bc   Make doc argument of emerge-defvar-local optional
       new  dc0f1ed   Add indent declaration to emerge-defvar-local


Summary of changes:
 lisp/vc/compare-w.el   |   2 +-
 lisp/vc/diff.el        |  10 +--
 lisp/vc/ediff-diff.el  |  32 ++++----
 lisp/vc/ediff-help.el  |   5 +-
 lisp/vc/ediff-init.el  | 211 +++++++++++++++++++++++++------------------------
 lisp/vc/ediff-mult.el  |  63 ++++++++-------
 lisp/vc/ediff-ptch.el  |  25 +++---
 lisp/vc/ediff-util.el  |  60 ++++++++------
 lisp/vc/ediff-wind.el  |  58 +++++++-------
 lisp/vc/ediff.el       |  15 ++--
 lisp/vc/emerge.el      | 129 ++++++++++++++++--------------
 lisp/vc/log-view.el    |   2 +-
 lisp/vc/pcvs.el        |  12 +--
 lisp/vc/smerge-mode.el |   2 +-
 lisp/vc/vc-dir.el      |  12 +--
 lisp/vc/vc-git.el      |   7 +-
 lisp/vc/vc-hg.el       |  13 ++-
 17 files changed, 342 insertions(+), 316 deletions(-)