[elpa] externals/counsel abb3049fd8 3/3: Merge branch 'master' into externals/counsel

[Basil L. Contovounesios]

branch: externals/counsel
commit abb3049fd8d76acb97d17f5ab8edc48ea31de59d
Merge: 603c29c648 aa18c1f486
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>

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

diff --git a/counsel.el b/counsel.el
index 05b70d6693..4c3cd02aa9 100644
--- a/counsel.el
+++ b/counsel.el
@@ -6125,7 +6125,7 @@ This function always returns its elements in a stable 
order."
       (when (file-exists-p dir)
         (let ((dir (file-name-as-directory dir)))
           ;; Function `directory-files-recursively' added in Emacs 25.1.
-          (dolist (file (directory-files-recursively dir ".*\\.desktop$"))
+          (dolist (file (directory-files-recursively dir "\\.desktop\\'"))
             (let ((id (subst-char-in-string ?/ ?- (file-relative-name file 
dir))))
               (when (and (not (gethash id hash)) (file-readable-p file))
                 (push (cons id file) result)