[Emacs-diffs] master 68ce800 13/21: Merge from origin/emacs-25

[John Wiegley]

branch: master
commit 68ce800e9200724d36a0b1bf1923401682bce96d
Merge: 5ab243f aae436e
Author: John Wiegley <address@hidden>
Commit: John Wiegley <address@hidden>

    Merge from origin/emacs-25
    
    aae436e Uncomment the next-error-function integration in xref
    5f0d096 Remove the word "valid", to avoid ambiguity
---
 doc/emacs/maintaining.texi |    4 ++--
 lisp/progmodes/xref.el     |    6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 72d428a..e81a190 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1806,7 +1806,7 @@ Go back to where you previously invoked @kbd{M-.} and 
friends
 @findex xref-find-definitions
   @kbd{M-.}@: (@code{xref-find-definitions}) shows the definitions of
 the identifier at point.  With a prefix argument, or if there's no
-valid identifier at point, it prompts for the identifier.  If the
+identifier at point, it prompts for the identifier.  If the
 identifier has only one definition, the command jumps to it.  If the
 identifier has more than one possible definition (e.g., in an
 object-oriented language, or if there's a function and a variable by
@@ -1923,7 +1923,7 @@ Restart one of the last 2 commands above, from the 
current location of point.
 @kindex M-?
 @findex xref-find-references
   @kbd{M-?} finds all the references for the identifier at point.  If
-there's no valid identifier at point, or when invoked with a prefix
+there's no identifier at point, or when invoked with a prefix
 argument, the command prompts for the identifier, with completion.  It
 then presents a @file{*xref*} buffer with all the references to the
 identifier, showing the file name and the line where the identifier is
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index f983525..1e6a69f 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -608,10 +608,8 @@ references displayed in the current *xref* buffer."
 (define-derived-mode xref--xref-buffer-mode special-mode "XREF"
   "Mode for displaying cross-references."
   (setq buffer-read-only t)
-  ;; FIXME: http://debbugs.gnu.org/20489
-  ;; (setq next-error-function #'xref--next-error-function)
-  ;; (setq next-error-last-buffer (current-buffer))
-  )
+  (setq next-error-function #'xref--next-error-function)
+  (setq next-error-last-buffer (current-buffer)))
 
 (defun xref--next-error-function (n reset?)
   (when reset?