[elpa] externals/embark c98bf2e9b5 2/2: Merge pull request #686 from minad/repair-wgrep

[ELPA Syncer]

branch: externals/embark
commit c98bf2e9b57e273d9c9759abfc373bea98cf54f9
Merge: 3f08fc8ede 310a97f13c
Author: Omar Antolín Camarena <omar.antolin@gmail.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #686 from minad/repair-wgrep
    
    Fix wgrep-header/footer-parser problem (See #602 and #604)
---
 embark-consult.el | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/embark-consult.el b/embark-consult.el
index b8e9f873bf..3767d52864 100644
--- a/embark-consult.el
+++ b/embark-consult.el
@@ -157,7 +157,6 @@ This function is meant to be added to 
`embark-collect-mode-hook'."
 
 (defvar grep-mode-line-matches)
 (defvar grep-num-matches-found)
-(defvar wgrep-header&footer-parser)
 (declare-function wgrep-setup "ext:wgrep")
 
 (defvar-keymap embark-consult-revert-map
@@ -200,7 +199,12 @@ This function is meant to be added to 
`embark-collect-mode-hook'."
       (use-local-map (make-composed-keymap
                       embark-consult-revert-map
                       (current-local-map)))
-      (setq-local wgrep-header&footer-parser #'embark-consult--wgrep-prepare)
+      ;; TODO Wgrep 3.0 and development versions use different names for the
+      ;; parser variable.
+      (defvar wgrep-header/footer-parser)
+      (defvar wgrep-header&footer-parser)
+      (setq-local wgrep-header/footer-parser #'embark-consult--wgrep-prepare
+                  wgrep-header&footer-parser #'embark-consult--wgrep-prepare)
       (when (fboundp 'wgrep-setup) (wgrep-setup)))
     (pop-to-buffer buf)))