[gnu] externals/hotfuzz aa53273d79 26/69: Avoid loading Selectrum for hotfuzz-selectrum-mode

[ELPA Syncer]

branch: externals/hotfuzz
commit aa53273d794c1e8579ff236f4854c636c18fb192
Author: Axel Forsman <axels...@gmail.com>
Commit: Axel Forsman <axels...@gmail.com>

    Avoid loading Selectrum for hotfuzz-selectrum-mode
    
    Because `selectrum-refine-candidates-function` and
    `selectrum-highlight-candidates-function` are defined with `defcustom`
    it is possible to restore them to their initial values when disabling
    the mode even if the variables never actually got set to those values.
    (This is done by looking up their `standard-value` symbol properties.)
---
 hotfuzz.el | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/hotfuzz.el b/hotfuzz.el
index 789dc131bf..d48687f11d 100644
--- a/hotfuzz.el
+++ b/hotfuzz.el
@@ -203,19 +203,23 @@ strings."
     "Minor mode that enables hotfuzz in Selectrum menus."
     :group 'hotfuzz
     :global t
-    (require 'selectrum)
     (if hotfuzz-selectrum-mode
         (setq hotfuzz--prev-selectrum-functions
-              `(,selectrum-refine-candidates-function
-                . ,selectrum-highlight-candidates-function)
+              `(,(when (boundp 'selectrum-refine-candidates-function)
+                   selectrum-refine-candidates-function)
+                . ,(when (boundp 'selectrum-highlight-candidates-function)
+                     selectrum-highlight-candidates-function))
               selectrum-refine-candidates-function #'hotfuzz-filter
               selectrum-highlight-candidates-function #'hotfuzz--highlight-all)
-      (pcase hotfuzz--prev-selectrum-functions
-        (`(,old-refine . ,old-highlight)
-         (when (eq selectrum-refine-candidates-function #'hotfuzz-filter)
-           (setq selectrum-refine-candidates-function old-refine))
-         (when (eq selectrum-highlight-candidates-function 
#'hotfuzz--highlight-all)
-           (setq selectrum-highlight-candidates-function old-highlight)))))))
+      (cl-flet ((restore
+                 (sym old our &aux (standard (car-safe (get sym 
'standard-value))))
+                 (cond ((not (eq (symbol-value sym) our)))
+                       (old (set sym old))
+                       (standard (set sym (eval standard t)))
+                       (t (makunbound sym)))))
+        (cl-destructuring-bind (old-rcf . old-hcf) 
hotfuzz--prev-selectrum-functions
+          (restore 'selectrum-refine-candidates-function old-rcf 
#'hotfuzz-filter)
+          (restore 'selectrum-highlight-candidates-function old-hcf 
#'hotfuzz--highlight-all))))))
 
 (provide 'hotfuzz)
 ;;; hotfuzz.el ends here