master updated (0f2d877 -> e226357)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  0f2d877   Recompute mode-lines when marking conflicts resolved
       new  44eb87c   Remove redundant requires of 'derived'
       new  fc66ec3   Prefer defvar-local in erc
       new  e226357   Remove redundant defvar for artist-mode


Summary of changes:
 lisp/erc/erc-backend.el         | 84 ++++++++++++++---------------------------
 lisp/erc/erc-capab.el           |  6 +--
 lisp/erc/erc-dcc.el             |  9 ++---
 lisp/erc/erc-ezbounce.el        |  3 +-
 lisp/erc/erc-join.el            |  3 +-
 lisp/erc/erc-netsplit.el        |  3 +-
 lisp/erc/erc-networks.el        |  3 +-
 lisp/erc/erc-notify.el          |  6 +--
 lisp/erc/erc-ring.el            |  6 +--
 lisp/erc/erc-stamp.el           |  9 ++---
 lisp/erc/erc.el                 | 75 ++++++++++++------------------------
 lisp/net/newst-backend.el       |  1 -
 lisp/net/newst-plainview.el     |  1 -
 lisp/play/gametree.el           |  1 -
 lisp/textmodes/artist.el        |  4 --
 lisp/textmodes/less-css-mode.el |  1 -
 16 files changed, 69 insertions(+), 146 deletions(-)