master updated (4252cea163 -> b65a2d1d99)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  4252cea163 Clarify lisp/Makefile.in comment
       new  cf98a395d0 * lib-src/etags.c: Remove XEmacs support.
       new  c6abfb32d7 Remove workaround for XEmacs bug in ediff-util.el
       new  4439a80407 Make compat function custom-reset-variables obsolete
       new  1f4f1358e6 Declare unused function ediff-user-grabbed-mouse obsolete
       new  e672cad231 ; Improve obsoletions in ediff-init.el
       new  b65a2d1d99 Make ediff-file-remote-p obsolete in favor of 
file-remote-p


Summary of changes:
 lib-src/etags.c       |  8 --------
 lisp/custom.el        |  1 +
 lisp/vc/ediff-init.el | 57 ++++++++++++++++++++++-----------------------------
 lisp/vc/ediff-mult.el |  2 --
 lisp/vc/ediff-ptch.el |  2 +-
 lisp/vc/ediff-util.el | 18 ++++------------
 lisp/vc/ediff-wind.el |  2 +-
 7 files changed, 31 insertions(+), 59 deletions(-)