Don't eagerly load xref

Fixes: debbugs:19554
* lisp/menu-bar.el (menu-bar-goto-menu): Before calling
`xref-marker-stack-empty-p', first check that `xref' is loaded.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4985ad14473270f9e86145a1c43838ad102a9604..504012eb5735a4fd099ec746a000c798088fa1fe 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-13  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * menu-bar.el (menu-bar-goto-menu): Before calling
+       `xref-marker-stack-empty-p', first check that `xref' is loaded.
+       (Bug#19554)
+
 2015-01-12  Martin Rudalics  <rudalics@gmx.at>
 
        * progmodes/xref.el (xref-marker-stack-empty-p): Add autoload

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 67cb3273d23bba7f39a9f0c78a0a76f20c052868..cd1a4d05b5595a4f58175a6c0ea9b4377f54cee8 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -381,7 +381,8 @@
 
     (bindings--define-key menu [xref-pop]
       '(menu-item "Back" xref-pop-marker-stack
-                  :visible (not (xref-marker-stack-empty-p))
+                  :visible (and (featurep 'xref)
+                                (not (xref-marker-stack-empty-p)))
                   :help "Back to the position of the last search"))
 
     (bindings--define-key menu [xref-apropos]