[nongnu] elpa/go-mode 5dd0353 1/2: XRef is no longer optional

[ELPA Syncer]

branch: elpa/go-mode
commit 5dd0353fabad4d8f1245288ababd8d634e78259a
Author: Dominik Honnef <dominik@honnef.co>
Commit: Dominik Honnef <dominik@honnef.co>

    XRef is no longer optional
    
    Updates gh-394
---
 go-mode.el | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/go-mode.el b/go-mode.el
index f1a5e0b..349c6bc 100644
--- a/go-mode.el
+++ b/go-mode.el
@@ -22,7 +22,7 @@
 (require 'find-file)
 (require 'ring)
 (require 'url)
-(require 'xref nil :noerror)  ; xref is new in Emacs 25.1
+(require 'xref)
 
 
 (eval-when-compile
@@ -2406,16 +2406,14 @@ description at POINT."
   "Jump to the definition of the expression at POINT."
   (interactive "d")
   (condition-case nil
-      (let ((file (car (godef--call point))))
-        (if (not (godef--successful-p file))
-            (message "%s" (godef--error file))
-          (push-mark)
-          (if (eval-when-compile (fboundp 'xref-push-marker-stack))
-              ;; TODO: Integrate this facility with XRef.
-              (xref-push-marker-stack)
-            (ring-insert find-tag-marker-ring (point-marker)))
-          (godef--find-file-line-column file other-window)))
-    (file-error (message "Could not run godef binary"))))
+         (let ((file (car (godef--call point))))
+               (if (not (godef--successful-p file))
+                       (message "%s" (godef--error file))
+                 (push-mark)
+                 ;; TODO: Integrate this facility with XRef.
+                 (xref-push-marker-stack)
+                 (godef--find-file-line-column file other-window)))
+       (file-error (message "Could not run godef binary"))))
 
 (defun godef-jump-other-window (point)
   (interactive "d")