From: John Wiegley <johnw@newartisans.com>
Date: Fri, 4 Mar 2016 07:53:26 +0000 (-0800)
Subject: Merge from origin/emacs-25
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/68ce800e9200724d36a0b1bf1923401682bce96d

Merge from origin/emacs-25

aae436e Uncomment the next-error-function integration in xref
5f0d096 Remove the word "valid", to avoid ambiguity
---

68ce800e9200724d36a0b1bf1923401682bce96d