emacs-elpa-diffs
[Top][All Lists]
Advanced

[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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]