[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/ivy-hydra 34a203f 374/395: counsel.el: Add prompt param
From: |
Basil L. Contovounesios |
Subject: |
[elpa] externals/ivy-hydra 34a203f 374/395: counsel.el: Add prompt param to counsel-mark--ivy-read |
Date: |
Thu, 25 Feb 2021 08:32:41 -0500 (EST) |
branch: externals/ivy-hydra
commit 34a203f05457cdc227ff36e28ca1d3a7f03c8c15
Author: Mohsin Kaleem <mohkale@kisara.moe>
Commit: Basil L. Contovounesios <contovob@tcd.ie>
counsel.el: Add prompt param to counsel-mark--ivy-read
See #2660; this commit just adds an extra parameter to
`counsel-mark--ivy-read` for specifying the prompt.
Closes #2772.
---
counsel.el | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/counsel.el b/counsel.el
index 3bb68b4..cfc1cd5 100644
--- a/counsel.el
+++ b/counsel.el
@@ -4078,7 +4078,7 @@ Obeys `widen-automatically', which see."
(cons (copy-marker (mark-marker)) marks)))
(candidates (counsel-mark--get-candidates marks)))
(if candidates
- (counsel-mark--ivy-read candidates 'counsel-mark-ring)
+ (counsel-mark--ivy-read "Mark: " candidates 'counsel-mark-ring)
(message "Mark ring is empty"))))
(defun counsel-mark--get-candidates (marks)
@@ -4102,7 +4102,7 @@ point to indicarte where the candidate mark is."
(propertize (format fmt linum line) 'point (point))))
marks))))))
-(defun counsel-mark--ivy-read (candidates caller)
+(defun counsel-mark--ivy-read (prompt candidates caller)
"call `ivy-read' with sane defaults for traversing marks.
CANDIDATES should be an alist with the `car' of the list being
the string displayed by ivy and the `cdr' being the point that
@@ -4110,7 +4110,7 @@ mark should take you to.
NOTE This has been abstracted out into it's own method so it can
be used by both `counsel-mark-ring' and `counsel-evil-marks'"
- (ivy-read "Mark: " candidates
+ (ivy-read prompt candidates
:require-match t
:update-fn #'counsel--mark-ring-update-fn
:action (lambda (cand)
@@ -4191,8 +4191,8 @@ When ARG is non-nil, display all active evil registers."
(let* ((counsel--mark-ring-calling-point (point))
(candidates (counsel-mark--get-evil-candidates arg)))
(if candidates
- (counsel-mark--ivy-read candidates 'counsel-evil-marks)
- (message "no evil marks are active")))
+ (counsel-mark--ivy-read "Evil mark: " candidates
'counsel-evil-marks)
+ (message "No evil marks are active")))
(user-error "Required feature `evil' not installed or loaded")))
;;** `counsel-package'
- [elpa] externals/ivy-hydra 387390b 312/395: Prefer derived-mode-p for major-mode comparisons, (continued)
- [elpa] externals/ivy-hydra 387390b 312/395: Prefer derived-mode-p for major-mode comparisons, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 8d840b2 317/395: counsel.el (counsel-find-file-undo): Undo changing current directory, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 9bb6841 347/395: counsel.el (counsel-highlight-with-face): Fix preselect on next call, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra dd9c88f 319/395: ivy-avy.el: Fix package-lint warnings, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 544e7de 314/395: ivy.el (ivy-completing-read): Work better with find-file-at-point, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 4f98f97 332/395: targets/plain.el: Install avy automatically, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 6a22192 360/395: ivy.el (ivy--highlight-default): Use match faces consistently, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra f8b1ab8 328/395: Minor fixes for recent additions, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra dd43ab1 346/395: Add Emacs 27 executable-find compatibility shim, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra c76d797 370/395: Clean up some stuff around counsel-locate, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 34a203f 374/395: counsel.el: Add prompt param to counsel-mark--ivy-read,
Basil L. Contovounesios <=
- [elpa] externals/ivy-hydra 71c59ae 377/395: ivy.el (ivy--format-minibuffer-line): Check for annotation-function in one more place, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 80101ca 383/395: counsel.el (counsel-ag-function): User switches override -i/-s, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra e0374dc 385/395: Support empty isearch in swiper-from-isearch, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 1477144 391/395: * .gitignore: Anchor ELPA files at project root., Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 63f1af0 392/395: * doc/scripts.el: Add copyright to tame the checking script, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra d47e354 393/395: Update copyright notices for 2021, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 65f5783 395/395: Select files relevant for the ivy-hydra package, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 968eea5 057/395: ivy.el (ivy-partial-or-done): Check if completion-cycle-threshold is a number, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 9619e3c 340/395: counsel.el (counsel-compile-get-make-help-invocations): new helper, Basil L. Contovounesios, 2021/02/25
- [elpa] externals/ivy-hydra 066ed7b 362/395: Added pretty counsel-linux-app-format-function, Basil L. Contovounesios, 2021/02/25