From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 2 May 2016 17:46:53 +0000 (-0700)
Subject: Merge from origin/emacs-25
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/2bf7bc4161a3b3e1eceaf8422773de87ae233ea3

Merge from origin/emacs-25

bf21c84 Fix quoting problem in cc-engine debug message
8f36614 Add electric-quote-string unit test
6280531 Don’t electrically quote ‘'’ in Python
fd7b430 `nreverse' Grep hits before passing them to xref--convert-hits
---

2bf7bc4161a3b3e1eceaf8422773de87ae233ea3