[elpa] externals/counsel 0e7b3dd8d5 2/2: Merge branch 'master' into externals/counsel

[Basil L. Contovounesios]

branch: externals/counsel
commit 0e7b3dd8d5bc7eb9b822d41ecc776db293e39123
Merge: aebf7b5022 0ca0c096f1
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>

    Merge branch 'master' into externals/counsel
---
 counsel.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/counsel.el b/counsel.el
index bd1c1b5bb3..a938330d49 100644
--- a/counsel.el
+++ b/counsel.el
@@ -4692,7 +4692,6 @@ 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)
@@ -4704,7 +4703,8 @@ S will be of the form \"[register]: content\"."
          (items (delete (assoc "*Rescan*" items) items))
          (items (cond ((eq major-mode 'emacs-lisp-mode)
                        (counsel-imenu-categorize-functions items))
-                      ((eq major-mode 'python-mode)
+                      ((and (derived-mode-p 'python-mode)
+                            (fboundp 'python-imenu-create-flat-index))
                        (python-imenu-create-flat-index))
                       (t
                        items))))