[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master a727eab 2/2: Merge commit 'b45fc3f6c0802be172c4e887d1cea26
From: |
Oleh Krehel |
Subject: |
[elpa] master a727eab 2/2: Merge commit 'b45fc3f6c0802be172c4e887d1cea268ce7866e0' from swiper |
Date: |
Tue, 29 Sep 2015 14:39:29 +0000 |
branch: master
commit a727eabe76a6b724d347f500f76968ed89457f75
Merge: 8b73497 b45fc3f
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Merge commit 'b45fc3f6c0802be172c4e887d1cea268ce7866e0' from swiper
---
packages/swiper/counsel.el | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/packages/swiper/counsel.el b/packages/swiper/counsel.el
index ac04e67..22dc505 100644
--- 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] master a727eab 2/2: Merge commit 'b45fc3f6c0802be172c4e887d1cea268ce7866e0' from swiper,
Oleh Krehel <=