From: Mattias EngdegÄrd Date: Sat, 21 Aug 2021 08:59:54 +0000 (+0200) Subject: Add xref operations to context menu unconditionally X-Git-Tag: emacs-28.0.90~1394 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=49435be616c14d5080e4147ca05204bea5cb1d4f;p=emacs.git Add xref operations to context menu unconditionally * lisp/progmodes/prog-mode.el (prog-context-menu): Add xref operations to the context menu even if xref hasn't been loaded yet; the functions involved are autoloaded (bug#50067). --- diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el index a8b608b018a..4f000d6613a 100644 --- a/lisp/progmodes/prog-mode.el +++ b/lisp/progmodes/prog-mode.el @@ -44,21 +44,21 @@ prettify-symbols-mode)) (defun prog-context-menu (menu) - (when (featurep 'xref) - (define-key-after menu [prog-separator] menu-bar-separator - 'mark-whole-buffer) - (define-key-after menu [xref-find-def] - '(menu-item "Find Definition" xref-find-definitions-at-mouse - :visible (save-excursion - (mouse-set-point last-input-event) - (xref-backend-identifier-at-point (xref-find-backend))) - :help "Find definition of function or variable") - 'prog-separator) - (define-key-after menu [xref-pop] - '(menu-item "Back Definition" xref-pop-marker-stack - :visible (not (xref-marker-stack-empty-p)) - :help "Back to the position of the last search") - 'xref-find-def)) + (define-key-after menu [prog-separator] menu-bar-separator + 'mark-whole-buffer) + (define-key-after menu [xref-find-def] + '(menu-item "Find Definition" xref-find-definitions-at-mouse + :visible (save-excursion + (mouse-set-point last-input-event) + (xref-backend-identifier-at-point + (xref-find-backend))) + :help "Find definition of function or variable") + 'prog-separator) + (define-key-after menu [xref-pop] + '(menu-item "Back Definition" xref-pop-marker-stack + :visible (not (xref-marker-stack-empty-p)) + :help "Back to the position of the last search") + 'xref-find-def) menu) (defvar prog-mode-map