[elpa] externals/consult 68ed535cc5 3/3: Revert "Deprecate consult-multi-occur"

[ELPA Syncer]

branch: externals/consult
commit 68ed535cc5d9943d29d9e45d1cbbb102ce7e2e74
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    Revert "Deprecate consult-multi-occur"
    
    This reverts commit 4a0d097435125238bfa2fc0853e780f58f90251e.
---
 CHANGELOG.org | 1 -
 README.org    | 4 ++++
 consult.el    | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index 722e18e522..643555f366 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -19,7 +19,6 @@
 - Org 9.6: Support new =org-fold-core= API (both overlays and text-properties)
 - Support abbreviated file names in =recentf-list=, see 
=recentf-filename-handler=.
 - Deprecate =consult-apropos=
-- Deprecate =consult-multi-occur=
 
 * Version 0.20 (2022-10-16)
 
diff --git a/README.org b/README.org
index e652424edc..cf66fba1f8 100644
--- a/README.org
+++ b/README.org
@@ -201,6 +201,7 @@ their descriptions.
 
 #+findex: consult-line
 #+findex: consult-line-multi
+#+findex: consult-multi-occur
 #+findex: consult-keep-lines
 #+findex: consult-focus-lines
 - =consult-line=: Enter search string and select from matching lines.
@@ -212,6 +213,8 @@ their descriptions.
   search across project buffers. If invoked with a prefix argument search 
across
   all buffers. The candidates are computed on demand based on the input. The
   command behaves like =consult-grep=, but operates on buffers instead of 
files.
+- =consult-multi-occur=: Replacement for =multi-occur= which uses
+  =completing-read-multiple=.
 - =consult-keep-lines=: Replacement for =keep/flush-lines= which uses the 
current
   completion style for filtering the buffer. The function updates the buffer
   while typing. In particular =consult-keep-lines= can narrow down an exported
@@ -786,6 +789,7 @@ configuration examples.
            ("M-s r" . consult-ripgrep)
            ("M-s l" . consult-line)
            ("M-s L" . consult-line-multi)
+           ("M-s m" . consult-multi-occur)
            ("M-s k" . consult-keep-lines)
            ("M-s u" . consult-focus-lines)
            ;; Isearch integration
diff --git a/consult.el b/consult.el
index e18f2130e0..3edc4b5628 100644
--- a/consult.el
+++ b/consult.el
@@ -2853,8 +2853,6 @@ See `multi-occur' for the meaning of the arguments BUFS, 
REGEXP and NLINES."
                 (occur-read-primary-args)))
   (occur-1 regexp nlines bufs))
 
-(make-obsolete 'consult-multi-occur 'consult-line-multi "0.20")
-
 ;;;;; Command: consult-outline
 
 (defun consult--outline-candidates ()