branch: externals/ivy commit 8518e16e0691388d37c8bcf4b544bfc8f5ecd566 Author: Basil L. Contovounesios <ba...@contovou.net> Commit: Basil L. Contovounesios <ba...@contovou.net>
Use function-put in more places * counsel.el (counsel-find-symbol, counsel-yank-pop): * ivy-avy.el (ivy-avy): * ivy.el (ivy-define-key): * swiper.el (swiper-query-replace, swiper-all-query-replace): Prefer 'function-put' to 'put' for function properties. --- counsel.el | 4 ++-- ivy-avy.el | 2 +- ivy.el | 2 +- swiper.el | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/counsel.el b/counsel.el index 1b79af178a..16836417b0 100644 --- a/counsel.el +++ b/counsel.el @@ -455,7 +455,7 @@ Used by commands `counsel-describe-symbol', "Jump to the definition of the current symbol." (interactive) (ivy-exit-with-action #'counsel--find-symbol)) -(put 'counsel-find-symbol 'no-counsel-M-x t) +(function-put #'counsel-find-symbol 'no-counsel-M-x t) (defun counsel--info-lookup-symbol () "Lookup the current symbol in the info docs." @@ -4677,7 +4677,7 @@ Note: Duplicate elements of `kill-ring' are always deleted." :action #'counsel-yank-pop-action :caller 'counsel-yank-pop))) -(put #'counsel-yank-pop 'delete-selection 'yank) +(function-put #'counsel-yank-pop 'delete-selection 'yank) (ivy-configure 'counsel-yank-pop :height 5 diff --git a/ivy-avy.el b/ivy-avy.el index 8f0d275ef6..355305f359 100644 --- a/ivy-avy.el +++ b/ivy-avy.el @@ -107,7 +107,7 @@ (when res (ivy-avy--action res))))) -(put 'ivy-avy 'no-counsel-M-x t) +(function-put #'ivy-avy 'no-counsel-M-x t) (unless (lookup-key ivy-minibuffer-map (kbd "C-'")) (define-key ivy-minibuffer-map (kbd "C-'") 'ivy-avy)) (add-to-list 'avy-styles-alist `(ivy-avy . ,ivy-avy-style)) diff --git a/ivy.el b/ivy.el index 35cbcfe067..48facf5344 100644 --- a/ivy.el +++ b/ivy.el @@ -315,7 +315,7 @@ action functions.") (defun ivy-define-key (keymap key def) "Forward to (`define-key' KEYMAP KEY DEF). Remove DEF from `counsel-M-x' list." - (put def 'no-counsel-M-x t) + (function-put def 'no-counsel-M-x t) (define-key keymap key def)) (defvar ivy-minibuffer-map diff --git a/swiper.el b/swiper.el index 88ab0e0d37..ad5876670d 100644 --- a/swiper.el +++ b/swiper.el @@ -247,7 +247,7 @@ If the input is empty, select the previous history element instead." (ivy-configure 'swiper-query-replace :update-fn #'swiper--query-replace-updatefn) -(put 'swiper-query-replace 'no-counsel-M-x t) +(function-put #'swiper-query-replace 'no-counsel-M-x t) (defvar inhibit-message) @@ -272,7 +272,7 @@ If the input is empty, select the previous history element instead." (goto-char (point-min)) (perform-replace from to t t nil))) (set-window-configuration wnd-conf)))))))) -(put 'swiper-all-query-replace 'no-counsel-M-x t) +(function-put #'swiper-all-query-replace 'no-counsel-M-x t) (defvar avy-all-windows) (defvar avy-style)