[elpa] externals/counsel 463a973 2/2: Merge branch 'master' into externals/counsel

[Basil L. Contovounesios]

branch: externals/counsel
commit 463a9735445c31fa63c2e7bb881205a1250bf990
Merge: acb95b5 bb7965a
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>

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

diff --git a/counsel.el b/counsel.el
index 6c85a28..e561517 100644
--- a/counsel.el
+++ b/counsel.el
@@ -894,9 +894,12 @@ CAND is a string returned by `counsel--M-x-externs'."
       (and (commandp sym)
            (not (get sym 'byte-obsolete-info))
            (not (get sym 'no-counsel-M-x))
-           (or (not (bound-and-true-p read-extended-command-predicate))
-               (and (functionp read-extended-command-predicate)
-                    (funcall read-extended-command-predicate sym buf)))))))
+           (cond ((not (bound-and-true-p read-extended-command-predicate)))
+                 ((functionp read-extended-command-predicate)
+                  (condition-case-unless-debug err
+                      (funcall read-extended-command-predicate sym buf)
+                    (error (message "read-extended-command-predicate: %s: %s"
+                                    sym (error-message-string err))))))))))
 
 (defun counsel--M-x-prompt ()
   "String for `M-x' plus the string representation of `current-prefix-arg'."