[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 560957f 074/184: Check if ivy--done is accepting a string.
From: |
Oleh Krehel |
Subject: |
[elpa] master 560957f 074/184: Check if ivy--done is accepting a string. |
Date: |
Wed, 16 Oct 2019 13:14:51 -0400 (EDT) |
branch: master
commit 560957f571c3c0685948b2aeb8bbaad4a4a47c6b
Author: Amos Bird <address@hidden>
Commit: Oleh Krehel <address@hidden>
Check if ivy--done is accepting a string.
Some ivy commands (e.g. swiper-isearch) provide an int instead of a
string. It won't work when the integer value is larger than unicode
which cannot be converted to a char.
```
Debugger entered--Lisp error: (wrong-type-argument char-or-string-p 5557661)
ivy--done(5557661)
ivy-done()
funcall-interactively(ivy-done)
call-interactively(ivy-done nil nil)
command-execute(ivy-done)
read-from-minibuffer(...)
ivy-read(...)
swiper-isearch()
```
Fixes #2200
---
ivy.el | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/ivy.el b/ivy.el
index 7fb4e9d..5307cab 100644
--- a/ivy.el
+++ b/ivy.el
@@ -746,12 +746,13 @@ N is obtained from `ivy-more-chars-alist'."
"Insert TEXT and exit minibuffer."
(if (member (ivy-state-prompt ivy-last) '("Create directory: " "Make
directory: "))
(ivy-immediate-done)
- (insert
- (setf (ivy-state-current ivy-last)
- (if (and ivy--directory
- (not (eq (ivy-state-history ivy-last)
'grep-files-history)))
- (expand-file-name text ivy--directory)
- text)))
+ (if (stringp text)
+ (insert
+ (setf (ivy-state-current ivy-last)
+ (if (and ivy--directory
+ (not (eq (ivy-state-history ivy-last)
'grep-files-history)))
+ (expand-file-name text ivy--directory)
+ text))))
(setq ivy-exit 'done)
(exit-minibuffer)))
- [elpa] master 9970ae6 180/184: counsel.el (counsel-read-directory-name): Add, (continued)
- [elpa] master 9970ae6 180/184: counsel.el (counsel-read-directory-name): Add, Oleh Krehel, 2019/10/16
- [elpa] master 7054901 176/184: ivy.el (ivy-occur-revert-buffer): Make more generic, Oleh Krehel, 2019/10/16
- [elpa] master fcef913 023/184: swiper-isearch: Fix regexes in "ignore-order" case, Oleh Krehel, 2019/10/16
- [elpa] master 0b85d9d 030/184: counsel.el (counsel-at-git-issue-p): Add vc-git-log-view-mode, Oleh Krehel, 2019/10/16
- [elpa] master 2db2c51 050/184: counsel.el (counsel-find-file-mkdir-action): make parents too, Oleh Krehel, 2019/10/16
- [elpa] master f90bc8c 164/184: ivy.el (ivy-configure): Add :height, Oleh Krehel, 2019/10/16
- [elpa] master 09c40fc 175/184: swiper.el (swiper--occur-insert-lines): Simplify, Oleh Krehel, 2019/10/16
- [elpa] master c69deb2 179/184: ivy.el: "~~" now works as expected for /sudo::, Oleh Krehel, 2019/10/16
- [elpa] master 24a6354 170/184: ivy.el (ivy--format): Improve docstring, Oleh Krehel, 2019/10/16
- [elpa] master 0d842e3 062/184: ivy.el (ivy-switch-buffer): Clean up, Oleh Krehel, 2019/10/16
- [elpa] master 560957f 074/184: Check if ivy--done is accepting a string.,
Oleh Krehel <=
- [elpa] master 3b4956a 123/184: counsel.el (counsel-evil-registers-height): Remove obsolete var, Oleh Krehel, 2019/10/16
- [elpa] master a1bb702 128/184: Nicer message when counsel-git-grep finds no match, Oleh Krehel, 2019/10/16
- [elpa] master 5d2938f 126/184: counsel.el (counsel-git-grep): Works with ivy--regex-fuzzy, Oleh Krehel, 2019/10/16
- [elpa] master 3a37741 147/184: swiper.el (swiper--update-input-ivy): Set case-fold-search, Oleh Krehel, 2019/10/16
- [elpa] master dea98fc 153/184: ivy.el (ivy-inhibit-action): Clean up docstring, Oleh Krehel, 2019/10/16
- [elpa] master 92f54f6 150/184: ivy.el (ivy-configure): Add :grep-p, Oleh Krehel, 2019/10/16
- [elpa] master abe5aa8 006/184: ivy.el (ivy-resume): Select original buffer for search functions, Oleh Krehel, 2019/10/16
- [elpa] master bfe4454 021/184: Fix swiper--isearch-filter-ignore-order return value, Oleh Krehel, 2019/10/16
- [elpa] master bb65c4e 039/184: swiper.el (swiper--current-window-start): Refactor, Oleh Krehel, 2019/10/16
- [elpa] master 76fff20 114/184: counsel-M-x: Propertize names of active modes., Oleh Krehel, 2019/10/16