diff options
| author | David Morgan <djm_uk@protonmail.com> | 2024-06-05 15:16:51 +0100 |
|---|---|---|
| committer | David Morgan <djm_uk@protonmail.com> | 2024-06-05 15:18:29 +0100 |
| commit | 4ddbe0f49b58fa9121a0cba78568703fe0662281 (patch) | |
| tree | dd971957e31dc8dc7c758b48ef0d1a5c7e1b1063 | |
| parent | 5fffc433fa4a439d6522f1f130b516dd3886cc5e (diff) | |
| download | dotfiles-4ddbe0f49b58fa9121a0cba78568703fe0662281.tar.gz | |
Use newer xref
| -rw-r--r-- | .emacs.d/lisp/init-editor.el | 15 | ||||
| -rw-r--r-- | .emacs.d/lisp/init-packages.el | 3 |
2 files changed, 14 insertions, 4 deletions
diff --git a/.emacs.d/lisp/init-editor.el b/.emacs.d/lisp/init-editor.el index d95dfe6..5cb0cc7 100644 --- a/.emacs.d/lisp/init-editor.el +++ b/.emacs.d/lisp/init-editor.el @@ -148,13 +148,24 @@ :bind ("C-c ." . operate-on-number-at-point)) -(use-feature xref +(defun +elpaca-unload-xref (e) + (and (featurep 'xref) (unload-feature 'xref t)) + (elpaca--continue-build e)) + +(defun +elpaca-xref-build-steps () + (append (butlast (if (file-exists-p (expand-file-name "xref" elpaca-builds-directory)) + elpaca--pre-built-steps elpaca-build-steps)) + (list '+elpaca-unload-xref'elpaca--activate-package))) + +;;(elpaca `(xref :build ,(+elpaca-xref-build-steps))) +(use-package xref + :ensure `(xref :build ,(+elpaca-xref-build-steps)) :custom (xref-search-program 'ripgrep) :config (defun xref-find-references-other-window (identifier) "Like `xref-find-references' but switch to the other window" (interactive (list (xref--read-identifier "Find references of: "))) - (xref--find-xrefs identifier 'references identifier 'window)) + (xref--find-xrefs identifier 'references identifier 'window)) (defun xref-find-references-other-frame (identifier) "Like `xref-find-references' but switch to the other frame" (interactive (list (xref--read-identifier "Find references of: "))) diff --git a/.emacs.d/lisp/init-packages.el b/.emacs.d/lisp/init-packages.el index fa9db8f..6084df2 100644 --- a/.emacs.d/lisp/init-packages.el +++ b/.emacs.d/lisp/init-packages.el @@ -87,6 +87,7 @@ (elpaca-wait) (add-to-list 'elpaca-ignored-dependencies 'project) +(add-to-list 'elpaca-ignored-dependencies 'xref) ;; https://github.com/progfolio/elpaca/wiki/Logging#auto-hiding-the-elpaca-log-buffer (defvar +elpaca-hide-log-commands '(eval-buffer eval-region eval-defun eval-last-sexp org-ctrl-c-ctrl-c eros-eval-defun eros-eval-last-sexp elisp-eval-region-or-buffer) @@ -143,7 +144,5 @@ (dolist (elt elts) (add-to-list list-var elt t))) -;; Built-in in 29.1+, but we want the latest - (provide 'init-packages) ;;; init-packages.el ends here |