[elpa] externals/orderless d09aab3795 3/3: Merge pull request #133 from minad/remove-skip-highlighting

[ELPA Syncer]

branch: externals/orderless
commit d09aab37951b25627b96660f429eaec969d16d8a
Merge: ae849b3d9f 36db91cdb1
Author: Omar Antolín Camarena <omar.antolin@gmail.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #133 from minad/remove-skip-highlighting
    
    Remove orderless-skip-highlighting
---
 orderless.el | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/orderless.el b/orderless.el
index 46fe803536..cf92d68854 100644
--- a/orderless.el
+++ b/orderless.el
@@ -109,13 +109,6 @@ or a function of a single string argument."
   "Vector of faces used (cyclically) for component matches."
   :type '(vector face))
 
-(defcustom orderless-skip-highlighting nil
-  "Skip highlighting the matching parts of candidates?
-If this is set to a function, the function is called to decide
-whether to skip higlighting the matches.  Any non-function non-nil
-value means highlighting is skipped."
-  :type '(choice boolean function))
-
 (defcustom orderless-matching-styles
   '(orderless-literal orderless-regexp)
   "List of component matching styles.
@@ -215,6 +208,10 @@ is determined by the values of `completion-ignore-case',
 `read-buffer-completion-ignore-case', as usual for completion."
   :type 'boolean)
 
+(defvar orderless-skip-highlighting nil)
+(make-obsolete-variable 'orderless-skip-highlighting
+                        "Use `orderless-filter' directly." "1.0")
+
 ;;; Matching styles
 
 (defun orderless-regexp (component)
@@ -453,16 +450,9 @@ This function is part of the `orderless' completion style."
   (let ((completions (orderless-filter string table pred)))
     (when completions
       (pcase-let ((`(,prefix . ,pattern)
-                   (orderless--prefix+pattern string table pred))
-                  (skip-highlighting
-                   (if (functionp orderless-skip-highlighting)
-                       (funcall orderless-skip-highlighting)
-                     orderless-skip-highlighting)))
-        (nconc
-         (if skip-highlighting
-             completions
-           (orderless-highlight-matches pattern completions))
-         (length prefix))))))
+                   (orderless--prefix+pattern string table pred)))
+        (nconc (orderless-highlight-matches pattern completions)
+               (length prefix))))))
 
 ;;;###autoload
 (defun orderless-try-completion (string table pred point)