[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 0477214 08/19: Fix `ivy-backward-delete-char-function'
From: |
Oleh Krehel |
Subject: |
[elpa] master 0477214 08/19: Fix `ivy-backward-delete-char-function' |
Date: |
Thu, 16 Apr 2015 12:18:10 +0000 |
branch: master
commit 04772141473c07172434a1cdb1cef248de518351
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Fix `ivy-backward-delete-char-function'
* ivy.el (ivy-on-del-error-function): Rename from
`ivy-backward-delete-char-function'.
(ivy-backward-delete-char): Don't use eval.
---
ivy.el | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ivy.el b/ivy.el
index c2749c9..b1fd85c 100644
--- a/ivy.el
+++ b/ivy.el
@@ -59,8 +59,9 @@ Set this to nil if you don't want the count."
"Whether to wrap around after the first and last candidate."
:type 'boolean)
-(defcustom ivy-backward-delete-char-function `(minibuffer-keyboard-quit)
- "Function called when ivy-backward-delete-char throws an error."
+(defcustom ivy-on-del-error-function 'minibuffer-keyboard-quit
+ "The handler for when `ivy-backward-delete-char' throws.
+This is usually meant as a quick exit out of the minibuffer."
:type 'function)
;;* User Visible
@@ -159,12 +160,13 @@ If the input is empty, select the previous history
element instead."
(defun ivy-backward-delete-char ()
"Forward to `backward-delete-char'.
-On error (read-only), call ivy-backward-delete-char-function."
+On error (read-only), call `ivy-on-del-error-function'."
(interactive)
(condition-case nil
(backward-delete-char 1)
(error
- (eval ivy-backward-delete-char-function))))
+ (when ivy-on-del-error-function
+ (funcall ivy-on-del-error-function)))))
;;** Entry Point
(defun ivy-read (prompt 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, 2015/04/16
- [elpa] master 0477214 08/19: Fix `ivy-backward-delete-char-function',
Oleh Krehel <=
- [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
- [elpa] master ba0590f 09/19: counsel.el: Update comments, Oleh Krehel, 2015/04/16