master updated (bde00266db4 -> 59dcd114332)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  bde00266db4 help-setup-xref: Clean up xref backend before non-Lisp 
uses
       new  e20ce5fcc53 Prefer defcustom :local specifier
       new  59dcd114332 Fix two warnings in smerge.el


Summary of changes:
 lisp/dirtrack.el             |  3 +--
 lisp/emacs-lisp/lisp.el      |  2 +-
 lisp/emulation/viper-init.el |  2 +-
 lisp/emulation/viper-util.el |  2 +-
 lisp/erc/erc.el              |  4 ++--
 lisp/files.el                |  5 ++---
 lisp/find-file.el            | 44 ++++++++++++++++++++++----------------------
 lisp/mh-e/mh-e.el            |  2 +-
 lisp/newcomment.el           |  2 +-
 lisp/obsolete/rlogin.el      |  3 +--
 lisp/play/decipher.el        |  4 ++--
 lisp/plstore.el              |  2 +-
 lisp/proced.el               | 24 ++++++++++++------------
 lisp/progmodes/fortran.el    |  3 +--
 lisp/shell.el                |  2 +-
 lisp/simple.el               |  4 ++--
 lisp/vc/ediff-init.el        |  8 +++-----
 lisp/vc/ediff-merg.el        | 10 ++++------
 lisp/vc/smerge-mode.el       |  4 ++--
 19 files changed, 61 insertions(+), 69 deletions(-)