[Emacs-diffs] master updated (d05806f -> 2bf7bc4)

[Paul Eggert]

eggert pushed a change to branch master.

      from  d05806f   alas, a map can have only one parent
      adds  fd7b430   `nreverse' Grep hits before passing them to 
xref--convert-hits
      adds  6280531   Don’t electrically quote ‘'’ in Python
      adds  8f36614   Add electric-quote-string unit test
      adds  bf21c84   Fix quoting problem in cc-engine debug message
       new  2bf7bc4   Merge from origin/emacs-25


Summary of changes:
 lisp/electric.el            |   11 ++++++++---
 lisp/progmodes/cc-engine.el |    2 +-
 lisp/progmodes/xref.el      |    2 +-
 test/lisp/electric-tests.el |    8 ++++++++
 4 files changed, 18 insertions(+), 5 deletions(-)