Merge commit 'b45fc3f6c0802be172c4e887d1cea268ce7866e0' from swiper

diff --git a/packages/swiper/counsel.el b/packages/swiper/counsel.el
index ac04e6775ae2e51152674e21c70b69e4bb67c19f..22dc505b3ee9a331e27deb945f2d4431d2c7aae4 100644 (file)
--- a/packages/swiper/counsel.el
+++ b/packages/swiper/counsel.el
@@ -727,7 +727,6 @@ CMD is a command name."
 (declare-function smex-detect-new-commands "ext:smex")
 (declare-function smex-update "ext:smex")
 (declare-function smex-rank "ext:smex")
-(declare-function package-installed-p "package")
 
 ;;;###autoload
 (defun counsel-M-x (&optional initial-input)
@@ -747,9 +746,7 @@ Optional INITIAL-INPUT is the initial input in the minibuffer."
          (cands obarray)
          (pred 'commandp)
          (sort t))
-    (when (or (featurep 'smex)
-              (package-installed-p 'smex))
-      (require 'smex)
+    (when (require 'smex nil 'noerror)
       (unless smex-initialized-p
         (smex-initialize))
       (smex-detect-new-commands)