[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/consult b56bd11: Rename consult-isearch to consult-isea
From: |
ELPA Syncer |
Subject: |
[elpa] externals/consult b56bd11: Rename consult-isearch to consult-isearch-history |
Date: |
Wed, 27 Oct 2021 06:57:13 -0400 (EDT) |
branch: externals/consult
commit b56bd1123d2d56b7cb1a5a2013e5e967ec769052
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
Rename consult-isearch to consult-isearch-history
---
CHANGELOG.org | 5 +++++
README.org | 18 +++++++++---------
consult.el | 17 +++++++++++------
3 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/CHANGELOG.org b/CHANGELOG.org
index 0c99465..bad7353 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -2,6 +2,11 @@
#+author: Daniel Mendler
#+language: en
+* Development
+
+- Rename =consult-isearch= to =consult-isearch-history=. The command is a
history
+ browsing command and not a replacement for Isearch.
+
* Version 0.12 (2021-10-11)
- Bugfixes
diff --git a/README.org b/README.org
index b794f87..9afa8b0 100644
--- a/README.org
+++ b/README.org
@@ -201,7 +201,6 @@ their descriptions.
#+findex: consult-multi-occur
#+findex: consult-keep-lines
#+findex: consult-focus-lines
- #+findex: consult-isearch
- =consult-line=: Enter search string and select from matching lines.
Supports live preview and recursive editing. The symbol at point and the
recent Isearch string are added to the "future history" and can be accessed
@@ -210,11 +209,6 @@ their descriptions.
- =consult-line-multi=: Search across multiple buffers. By default search
across
project buffers. If invoked with a prefix argument search across all
buffers.
Behaves like =consult-line=.
- - =consult-isearch=: During an Isearch session, this command picks a
- search string from history and continues the search with the newly selected
- string. Outside of Isearch, the command allows you to pick a string from the
- history and starts a new Isearch. =consult-isearch= acts as a drop-in
- replacement for =isearch-edit-string=.
- =consult-multi-occur=: Replacement for =multi-occur= which uses
=completing-read-multiple=.
- =consult-keep-lines=: Replacement for =keep/flush-lines=
@@ -296,6 +290,7 @@ their descriptions.
#+findex: consult-complex-command
#+findex: consult-history
+ #+findex: consult-isearch-history
- =consult-complex-command=: Select a command from the
=command-history=. This command is a =completing-read= version of
=repeat-complex-command= and is also a replacement for the =command-history=
@@ -303,6 +298,11 @@ their descriptions.
- =consult-history=: Insert a string from the current buffer history.
You can invoke this command from the minibuffer. In that case
=consult-history=
uses the history stored in the =minibuffer-history-variable=.
+ - =consult-isearch-history=: During an Isearch session, this command picks a
+ search string from history and continues the search with the newly selected
+ string. Outside of Isearch, the command allows you to pick a string from the
+ history and starts a new Isearch. =consult-isearch-history= acts as a
drop-in
+ replacement for =isearch-edit-string=.
** Modes
:properties:
@@ -816,10 +816,10 @@ configuration examples.
("M-s k" . consult-keep-lines)
("M-s u" . consult-focus-lines)
;; Isearch integration
- ("M-s e" . consult-isearch)
+ ("M-s e" . consult-isearch-history)
:map isearch-mode-map
- ("M-e" . consult-isearch) ;; orig.
isearch-edit-string
- ("M-s e" . consult-isearch) ;; orig.
isearch-edit-string
+ ("M-e" . consult-isearch-history) ;; orig.
isearch-edit-string
+ ("M-s e" . consult-isearch-history) ;; orig.
isearch-edit-string
("M-s l" . consult-line) ;; needed by
consult-line to detect isearch
("M-s L" . consult-line-multi)) ;; needed by
consult-line to detect isearch
diff --git a/consult.el b/consult.el
index 19b4673..6fa2ca0 100644
--- a/consult.el
+++ b/consult.el
@@ -3517,7 +3517,7 @@ In order to select from a specific HISTORY, pass the
history variable as argumen
(delete-minibuffer-contents))
(insert (substring-no-properties str))))
-;;;;; Command: consult-isearch
+;;;;; Command: consult-isearch-history
(defun consult-isearch-forward (&optional reverse)
"Continue isearch forward optionally in REVERSE."
@@ -3535,12 +3535,12 @@ In order to select from a specific HISTORY, pass the
history variable as argumen
(put #'consult-isearch-backward 'completion-predicate #'ignore)
(put #'consult-isearch-forward 'completion-predicate #'ignore)
-(defvar consult-isearch-map
+(defvar consult-isearch-history-map
(let ((map (make-sparse-keymap)))
(define-key map [remap isearch-forward] #'consult-isearch-forward)
(define-key map [remap isearch-backward] #'consult-isearch-backward)
map)
- "Additional keymap used by `consult-isearch'.")
+ "Additional keymap used by `consult-isearch-history'.")
(defun consult--isearch-candidates ()
"Return isearch history candidates."
@@ -3581,8 +3581,8 @@ In order to select from a specific HISTORY, pass the
history variable as argumen
(?w . "Word")))
;;;###autoload
-(defun consult-isearch ()
- "Read a search string with completion from history.
+(defun consult-isearch-history ()
+ "Read a search string with completion from the Isearch history.
This replaces the current search string if Isearch is active, and
starts a new Isearch session otherwise."
@@ -3602,7 +3602,7 @@ starts a new Isearch session otherwise."
:history t ;; disable history
:sort nil
:initial isearch-string
- :keymap consult-isearch-map
+ :keymap consult-isearch-history-map
:annotate
(lambda (cand)
(concat align (alist-get (consult--tofu-get cand)
consult--isearch-narrow)))
@@ -3633,6 +3633,11 @@ starts a new Isearch session otherwise."
(setq isearch-regexp t
isearch-regexp-function nil))))
+(define-obsolete-function-alias
+ 'consult-isearch
+ 'consult-isearch-history
+ "0.12")
+
;;;;; Command: consult-minor-mode-menu
(defun consult--minor-mode-candidates ()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] externals/consult b56bd11: Rename consult-isearch to consult-isearch-history,
ELPA Syncer <=