[elpa] externals/ivy e9c0fb953d 09/10: Clean up compatibility of recent changes

[Basil L. Contovounesios]

branch: externals/ivy
commit e9c0fb953db9f6a23018a52441f3cd775710472c
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>

    Clean up compatibility of recent changes
    
    * counsel.el: Remove unused dynvar and add needed function
    declarations.
    (counsel-yank-pop-action): Pacify undefined vterm-insert warning.
    * ivy-overlay.el (ivy-display-function-overlay): Simplify Emacs
    version check.
---
 counsel.el     | 11 ++++++-----
 ivy-overlay.el |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/counsel.el b/counsel.el
index 7f7e6fd16a..bd1c1b5bb3 100644
--- a/counsel.el
+++ b/counsel.el
@@ -354,13 +354,12 @@ Update the minibuffer with the amount of lines collected 
every
 
 ;;** `counsel-company'
 (defvar company-candidates)
-(defvar company-common)
-(defvar company-prefix)
 (declare-function company-abort "ext:company")
 (declare-function company-complete "ext:company")
 (declare-function company-mode "ext:company")
 (declare-function company-call-backend "ext:company")
 (declare-function company--clean-string "ext:company")
+(declare-function company--continue "ext:company")
 
 ;;;###autoload
 (defun counsel-company ()
@@ -4493,9 +4492,10 @@ mark, as per \\[universal-argument] \\[yank]."
   "Like `yank-pop', but insert the kill corresponding to S.
 Signal a `buffer-read-only' error if called from a read-only
 buffer position."
-  (if (eq major-mode 'vterm-mode)
-      (let ((inhibit-read-only t))
-        (vterm-insert s)))
+  (when (and (eq major-mode 'vterm-mode)
+             (fboundp 'vterm-insert))
+    (let ((inhibit-read-only t))
+      (vterm-insert s)))
   (barf-if-buffer-read-only)
   (setq yank-window-start (window-start))
   (unless (eq last-command 'yank)
@@ -4692,6 +4692,7 @@ S will be of the form \"[register]: content\"."
 (defvar imenu-auto-rescan-maxout)
 (declare-function imenu--subalist-p "imenu")
 (declare-function imenu--make-index-alist "imenu")
+(declare-function python-imenu-create-flat-index "python")
 
 (defun counsel--imenu-candidates ()
   (require 'imenu)
diff --git a/ivy-overlay.el b/ivy-overlay.el
index f553cc7251..b61fcaf093 100644
--- a/ivy-overlay.el
+++ b/ivy-overlay.el
@@ -153,7 +153,8 @@ Hide the minibuffer contents and cursor."
                           (+
                            (if (and (eq major-mode 'org-mode)
                                     (bound-and-true-p org-indent-mode)
-                                    (version< emacs-version "28.1"))
+                                    ;; FIXME: Should this check `org-version'?
+                                    (< emacs-major-version 28))
                                (if (org-at-heading-p)
                                    (1- (org-current-level))
                                  (* org-indent-indentation-per-level (or 
(org-current-level) 1)))