From 329b902141c68190a2d8a5d6fd9312b6a816471c Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Tue, 13 Jan 2015 06:06:15 +0300 Subject: [PATCH] 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 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4985ad14473..504012eb573 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-01-13 Dmitry Gutov + + * 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 * progmodes/xref.el (xref-marker-stack-empty-p): Add autoload diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 67cb3273d23..cd1a4d05b55 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] -- 2.11.4.GIT