branch: elpa/vcomplete commit acf575c8affc845e7472352436d2a9b5ebd92827 Author: Daniel Semyonov <dan...@dsemy.com> Commit: Daniel Semyonov <dan...@dsemy.com>
Remove Embark integration Embark integration broke in a non-trivial way and I no longer use it, so it is now removed. * vcomplete-embark.el: Remove. --- .elpaignore | 1 + NEWS | 6 +++ vcomplete-embark.el | 108 ---------------------------------------------------- vcomplete.texi | 8 ---- 4 files changed, 7 insertions(+), 116 deletions(-) diff --git a/.elpaignore b/.elpaignore index 05db472dcf..fc77748a78 100644 --- a/.elpaignore +++ b/.elpaignore @@ -3,3 +3,4 @@ LICENSE Makefile README config.mk +vcomplete-embark.el diff --git a/NEWS b/NEWS index 42eba5e57b..e30f8fc166 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,12 @@ Vcomplete NEWS -- history of user-visible changes. -*- mode: outline -*- See the end of the file for an explanation of the versioning scheme. +* 1.3 + +** Remove Embark integration. +Embark integration broke in a non-trivial way, so it has been removed +due to a lack of interest in maintaining it. + * 1.2 ** Fix the completion list window still highlighting completions in some diff --git a/vcomplete-embark.el b/vcomplete-embark.el deleted file mode 100644 index b693fab355..0000000000 --- a/vcomplete-embark.el +++ /dev/null @@ -1,108 +0,0 @@ -;;; vcomplete-embark.el --- Embark integration for Vcomplete -*- lexical-binding: t -*- - -;; Copyright (C) 2021-2022 Daniel Semyonov - -;; Author: Daniel Semyonov <dan...@dsemy.com> -;; Maintainer: Daniel Semyonov <dan...@dsemy.com> -;; Version: 1.2 -;; Package-Requires: ((emacs "25.1") (embark "0.10")) -;; Keywords: convenience, matching -;; URL: https://dsemy.com/projects/vcomplete - -;; This file is not part of GNU Emacs. - -;; Vcomplete is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published -;; by the Free Software Foundation; either version 3, or (at your -;; option) any later version. - -;; Vcomplete is distributed in the hope that it will be useful, but -;; WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;; General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see <https://www.gnu.org/licenses/>. - -;;; Commentary: - -;; Embark integration for Vcomplete. -;; -;; Usage: -;; -;; Enable `vcomplete-embark-mode': -;; -;; (vcomplete-embark-mode) -;; -;; For use-package users: -;; -;; (use-package vcomplete -;; :config -;; (vcomplete-mode) -;; (vcomplete-embark-mode)) -;; -;; When `vcomplete-embark-mode' is active: -;; - Embark commands (like `embark-act') will operate on the -;; highlighted completion in the completion list buffer (when -;; available). -;; -;; For more information see the (Vcomplete) and (Embark) info nodes. - -;;; Code: - -(eval-when-compile - (require 'vcomplete)) - -(declare-function embark-target-completion-at-point "ext:embark") - -(defun vcomplete-embark--reset-auto-update () - "Re-enable `vcomplete-auto-update'." - (setq vcomplete-auto-update t) - (remove-hook 'embark-post-action-hook #'vcomplete-embark--reset-auto-update)) - -(defun vcomplete-embark--inhibit-auto-update (fun &rest args) - "Inhibit `vcomplete-auto-update' while performing Embark actions. -When `vcomplete-auto-update' is nil, just call FUN with ARGS." - (if (not vcomplete-auto-update) - (apply fun args) - (setq vcomplete-auto-update nil) - ;; This hook is needed because the last part of this function will not - ;; run if an Embark action has been performed (marked below). - (add-hook 'embark-post-action-hook #'vcomplete-embark--reset-auto-update) - (apply fun args) - ;; If an action has been performed this part will not run. - (vcomplete-embark--reset-auto-update))) - -(defun vcomplete-embark-current-completion (&optional relative) - "Call `embark-target-completion-at-point' in the `*Completions*' buffer. -If the completions are file names and RELATIVE is non-nil, return -relative path." - (when (and vcomplete-mode - (or (minibufferp) completion-in-region-mode)) - (vcomplete-with-completions-buffer - (embark-target-completion-at-point relative)))) - -;;;###autoload -(define-minor-mode vcomplete-embark-mode - "Toggle Vcomplete's Embark integration. - -When Vcomplete's Embark integration is enabled, Embark commands (like -`embark-act') will operate on the highlighted completion in the -`*Completions*' buffer." - :global t - :group 'vcomplete - (require 'embark) - (if vcomplete-embark-mode - (progn - (add-hook 'embark-target-finders - #'vcomplete-embark-current-completion) - (advice-add 'embark--prompt-for-action :around - #'vcomplete-embark--inhibit-auto-update)) - (remove-hook 'embark-target-finders - #'vcomplete-embark-current-completion) - (advice-remove 'embark--prompt-for-action - #'vcomplete-embark--inhibit-auto-update))) - -(provide 'vcomplete-embark) - -;;; vcomplete-embark.el ends here diff --git a/vcomplete.texi b/vcomplete.texi index 3a6601eb03..242809d6a1 100644 --- a/vcomplete.texi +++ b/vcomplete.texi @@ -178,14 +178,6 @@ You may use these commands without enabling @code{vcomplete-mode} @xref{Completion commands} for information regarding defining new commands. -Vcomplete also comes with (optional) support for Embark. To enable it: - -@cindex vcomplete-embark-mode -@table @asis -@item @kbd{M-x vcomplete-embark-mode RET} -You can also add @code{(vcomplete-embark-mode)} to your init file, instead. -@end table - @node Customization @chapter Customization