From: Oleh Krehel <ohwoeowho@gmail.com>
Date: Tue, 29 Sep 2015 14:40:01 +0000 (+0200)
Subject: Merge commit 'b45fc3f6c0802be172c4e887d1cea268ce7866e0' from swiper
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/a727eabe76a6b724d347f500f76968ed89457f75?hp=-c

Merge commit 'b45fc3f6c0802be172c4e887d1cea268ce7866e0' from swiper
---

a727eabe76a6b724d347f500f76968ed89457f75
diff --combined packages/swiper/counsel.el
index ac04e6775,22dc505b3..22dc505b3
--- a/packages/swiper/counsel.el
+++ b/packages/swiper/counsel.el
@@@ -727,7 -727,6 +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 +746,7 @@@ Optional INITIAL-INPUT is the initial i
           (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)