[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master a8a1f65 02/19: Add numeric arguments to arrows
From: |
Oleh Krehel |
Subject: |
[elpa] master a8a1f65 02/19: Add numeric arguments to arrows |
Date: |
Thu, 16 Apr 2015 12:18:08 +0000 |
branch: master
commit a8a1f652de4f2681976a69a57123841f7e590724
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Add numeric arguments to arrows
* ivy.el (ivy-next-line): Update.
(ivy-next-line-or-history): Update.
(ivy-previous-line): Update.
(ivy-previous-line-or-history): Update.
(ivy-read): Update doc.
---
ivy.el | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/ivy.el b/ivy.el
index c6ec991..25b45dd 100644
--- a/ivy.el
+++ b/ivy.el
@@ -105,37 +105,39 @@ of `history-length', which see.")
(interactive)
(setq ivy--index (1- ivy--length)))
-(defun ivy-next-line ()
- "Select the next completion candidate."
- (interactive)
- (if (>= ivy--index (1- ivy--length))
- (when ivy-wrap
- (ivy-beginning-of-buffer))
- (cl-incf ivy--index)))
-
-(defun ivy-next-line-or-history ()
- "Select the next completion candidate.
+(defun ivy-next-line (&optional arg)
+ "Move cursor vertically down ARG candidates."
+ (interactive "p")
+ (cl-incf ivy--index arg)
+ (when (>= ivy--index (1- ivy--length))
+ (if ivy-wrap
+ (ivy-beginning-of-buffer)
+ (setq ivy--index (1- ivy--length)))))
+
+(defun ivy-next-line-or-history (&optional arg)
+ "Move cursor vertically down ARG candidates.
If the input is empty, select the previous history element instead."
- (interactive)
+ (interactive "p")
(when (string= ivy-text "")
(ivy-previous-history-element 1))
- (ivy-next-line))
+ (ivy-next-line arg))
-(defun ivy-previous-line ()
- "Select the previous completion candidate."
- (interactive)
- (if (zerop ivy--index)
- (when ivy-wrap
- (ivy-end-of-buffer))
- (cl-decf ivy--index)))
-
-(defun ivy-previous-line-or-history ()
- "Select the previous completion candidate.
+(defun ivy-previous-line (&optional arg)
+ "Move cursor vertically up ARG candidates."
+ (interactive "p")
+ (cl-decf ivy--index arg)
+ (when (< ivy--index 0)
+ (if ivy-wrap
+ (ivy-end-of-buffer)
+ (setq ivy--index 0))))
+
+(defun ivy-previous-line-or-history (arg)
+ "Move cursor vertically up ARG candidates.
If the input is empty, select the previous history element instead."
- (interactive)
+ (interactive "p")
(when (string= ivy-text "")
(ivy-previous-history-element 1))
- (ivy-previous-line))
+ (ivy-previous-line arg))
(defun ivy-previous-history-element (arg)
"Forward to `previous-history-element' with ARG."
@@ -166,17 +168,18 @@ On error (read-only), quit without selecting."
PROMPT is a string to prompt with; normally it ends in a colon
and a space. When PROMPT contains %d, it will be updated with
the current number of matching candidates.
+See also `ivy-count-format'.
COLLECTION is a list of strings.
If INITIAL-INPUT is non-nil, insert it in the minibuffer initially.
-UPDATE-FN is called each time the current candidate(s) is changed.
+KEYMAP is composed together with `ivy-minibuffer-map'.
If PRESELECT is non-nil select the corresponding candidate out of
the ones that match INITIAL-INPUT.
-KEYMAP is composed together with `ivy-minibuffer-map'."
+UPDATE-FN is called each time the current candidate(s) is changed."
(cl-case (length collection)
(0 nil)
(1 (car collection))
- [elpa] master updated (cf04c93 -> 22139ae), Oleh Krehel, 2015/04/16
- [elpa] master 0d619ea 10/19: counsel.el (couns-clj): Add with-no-warnings, Oleh Krehel, 2015/04/16
- [elpa] master 6dd560c 05/19: swiper.el (swiper-map): Bind "C-l" to recenter, Oleh Krehel, 2015/04/16
- [elpa] master 49321c0 06/19: Allow duplicate candidates in `ivy-read', Oleh Krehel, 2015/04/16
- [elpa] master f72a860 11/19: counsel.el: Fixup prefixes, Oleh Krehel, 2015/04/16
- [elpa] master 841d59b 01/19: "C-s" should forward to "C-n" etc, Oleh Krehel, 2015/04/16
- [elpa] master 609577e 12/19: Fix invalid package header line, Oleh Krehel, 2015/04/16
- [elpa] master e816884 03/19: Default ARG to 1 for arrows, Oleh Krehel, 2015/04/16
- [elpa] master a8a1f65 02/19: Add numeric arguments to arrows,
Oleh Krehel <=
- [elpa] master 0477214 08/19: Fix `ivy-backward-delete-char-function', Oleh Krehel, 2015/04/16
- [elpa] master 6dd1068 04/19: swiper.el (swiper-query-replace): Enable recursive minibuffers, Oleh Krehel, 2015/04/16
- [elpa] master 3b78e0e 18/19: swiper.el: Bump version, Oleh Krehel, 2015/04/16
- [elpa] master 22139ae 19/19: Merge commit '3b78e0e503f4763f8a2d77eeacfc91213ec5532e' from swiper, Oleh Krehel, 2015/04/16
- [elpa] master c59752b 16/19: Update sorting order, make sure that perfect match is selected, Oleh Krehel, 2015/04/16
- [elpa] master 75aa14d 17/19: Fix thing-at-point in describe-function and -variable, Oleh Krehel, 2015/04/16
- [elpa] master 6a098c6 15/19: Add ivy-mode, Oleh Krehel, 2015/04/16
- [elpa] master 592b692 07/19: Add defcustom for ivy-backward-delete-char, Oleh Krehel, 2015/04/16
- [elpa] master 048f479 13/19: Add four more commands, Oleh Krehel, 2015/04/16
- [elpa] master be452cc 14/19: swiper.el (swiper-font-lock-ensure): Exclude org-agenda-mode, Oleh Krehel, 2015/04/16