[Emacs-diffs] master 329b902: Don't eagerly load xref

[Dmitry Gutov]

branch: master
commit 329b902141c68190a2d8a5d6fd9312b6a816471c
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    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.
---
 lisp/ChangeLog   |    6 ++++++
 lisp/menu-bar.el |    3 ++-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4985ad1..504012e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-13  Dmitry Gutov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/xref.el (xref-marker-stack-empty-p): Add autoload
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 67cb327..cd1a4d0 100644
--- 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]