From: Dmitry Gutov <dgutov@yandex.ru>
Date: Sat, 14 Nov 2015 00:40:06 +0000 (+0200)
Subject: ; Update xref-etags-mode for the latest change
X-Git-Tag: emacs-25.0.90~803^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7126e9a40b7ffbf336dcb0209020db112696a871;p=emacs.git

; Update xref-etags-mode for the latest change
---

diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 489a2ec0b0d..6a3b42ff646 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -812,14 +812,9 @@ and just use etags."
   :lighter ""
   (if xref-etags-mode
       (progn
-        (setq xref-etags-mode--saved
-              (cons xref-find-function
-                    xref-identifier-completion-table-function))
-        (kill-local-variable 'xref-find-function)
-        (kill-local-variable 'xref-identifier-completion-table-function))
-    (setq-local xref-find-function (car xref-etags-mode--saved))
-    (setq-local xref-identifier-completion-table-function
-                (cdr xref-etags-mode--saved))))
+        (setq xref-etags-mode--saved xref-backend-functions)
+        (kill-local-variable 'xref-backend-functions))
+    (setq-local xref-backend-functions xref-etags-mode--saved)))
 
 (declare-function semantic-symref-find-references-by-name "semantic/symref")
 (declare-function semantic-find-file-noselect "semantic/fw")