[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/ivy-posframe 0a8cb5a 101/195: fix advice function style

From: Feng Shu
Subject: [elpa] externals/ivy-posframe 0a8cb5a 101/195: fix advice function style
Date: Sat, 3 Oct 2020 07:11:53 -0400 (EDT)

branch: externals/ivy-posframe
commit 0a8cb5a6b22f2204d162facdb14401b4dbfa5b3c
Author: conao3 <conao3@gmail.com>
Commit: conao3 <conao3@gmail.com>

    fix advice function style
 ivy-posframe.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ivy-posframe.el b/ivy-posframe.el
index f5cc474..465c66d 100644
--- a/ivy-posframe.el
+++ b/ivy-posframe.el
@@ -411,10 +411,10 @@ selection, non-nil otherwise."
 ;;; Advice
-(defun ivy-posframe--minibuffer-setup (orig-func)
+(defun ivy-posframe--minibuffer-setup (fn &rest args)
   "Advice function of `ivy--minibuffer-setup'."
   (let ((ivy-fixed-height-minibuffer nil))
-    (funcall orig-func))
+    (apply fn args))
   (when (and ivy-posframe-hide-minibuffer
              ;; only hide minibuffer's info when posframe is showed.
@@ -425,8 +425,9 @@ selection, non-nil otherwise."
                      `(:background ,bg-color :foreground ,bg-color)))
       (setq-local cursor-type nil))))
-(defun ivy-posframe--add-prompt ()
+(defun ivy-posframe--add-prompt (fn &rest args)
   "Add the ivy prompt to the posframe."
+  (apply fn args)
   (unless ivy-posframe--ignore-prompt
     (with-current-buffer (window-buffer (active-minibuffer-window))
       (let ((point (point))
@@ -458,7 +459,7 @@ selection, non-nil otherwise."
   (define-key ivy-minibuffer-map [remap ivy-avy] 'ivy-posframe-avy)
   (define-key ivy-minibuffer-map [remap swiper-avy] 'ivy-posframe-swiper-avy)
   (advice-add 'ivy--minibuffer-setup :around #'ivy-posframe--minibuffer-setup)
-  (advice-add 'ivy--queue-exhibit :after #'ivy-posframe--add-prompt)
+  (advice-add 'ivy--queue-exhibit :around #'ivy-posframe--add-prompt)
   (message "ivy-posframe is enabled, disabling it need to reboot emacs."))

reply via email to

[Prev in Thread] Current Thread [Next in Thread]