[elpa] externals/ivy 4ec25a5 2/2: Merge branch 'master' into externals/ivy

[Basil L. Contovounesios]

branch: externals/ivy
commit 4ec25a508e3b6764c181346e051f592bf6c9c2bc
Merge: 19d8694 8b5cb11
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>

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

diff --git a/ivy.el b/ivy.el
index 8fc0e31..256aeaa 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1894,6 +1894,7 @@ The child caller inherits and can override the settings 
of the parent.")
                          unwind-fn
                          index-fn
                          sort-fn
+                         sort-matches-fn
                          format-fn
                          display-fn
                          display-transformer-fn
@@ -1921,6 +1922,8 @@ The child caller inherits and can override the settings 
of the parent.")
     (ivy--alist-set 'ivy-index-functions-alist caller index-fn))
   (when sort-fn
     (ivy--alist-set 'ivy-sort-functions-alist caller sort-fn))
+  (when sort-matches-fn
+    (ivy--alist-set 'ivy-sort-matches-functions-alist caller sort-matches-fn))
   (when format-fn
     (ivy--alist-set 'ivy-format-functions-alist caller format-fn))
   (when display-fn