[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master f0e49d5 213/348: Improve recursive minibuffers with two em
From: |
Oleh Krehel |
Subject: |
[elpa] master f0e49d5 213/348: Improve recursive minibuffers with two emacsclients |
Date: |
Sat, 8 Apr 2017 11:03:59 -0400 (EDT) |
branch: master
commit f0e49d521616b7001e5da7ab2e941434e57c2f06
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Improve recursive minibuffers with two emacsclients
* ivy.el (ivy-state): New field frame.
(ivy-read): Save selected frame.
(ivy--reset-state): Select the active minibuffer window if the frame was
switched.
Fixes #738
Packages using Ivy should be recompiled, since the definition of
ivy-state struct is changed.
---
ivy.el | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/ivy.el b/ivy.el
index 030c8b5..dbeb55f 100644
--- a/ivy.el
+++ b/ivy.el
@@ -315,6 +315,8 @@ action functions.")
prompt collection
predicate require-match initial-input
history preselect keymap update-fn sort
+ ;; The frame in which `ivy-read' was called
+ frame
;; The window in which `ivy-read' was called
window
;; The buffer in which `ivy-read' was called
@@ -1424,6 +1426,7 @@ customizations apply to the current completion session."
:update-fn update-fn
:sort sort
:action action
+ :frame (selected-frame)
:window (selected-window)
:buffer (current-buffer)
:unwind unwind
@@ -1477,6 +1480,8 @@ customizations apply to the current completion session."
(defun ivy--reset-state (state)
"Reset the ivy to STATE.
This is useful for recursive `ivy-read'."
+ (unless (equal (selected-frame) (ivy-state-frame state))
+ (select-window (active-minibuffer-window)))
(let ((prompt (or (ivy-state-prompt state) ""))
(collection (ivy-state-collection state))
(predicate (ivy-state-predicate state))
- [elpa] master dc693c3 280/348: Make ivy--flx-sort more intelligent, (continued)
- [elpa] master dc693c3 280/348: Make ivy--flx-sort more intelligent, Oleh Krehel, 2017/04/08
- [elpa] master 182e35e 298/348: Apply search highlighting for evil when applicable, Oleh Krehel, 2017/04/08
- [elpa] master aedea1a 289/348: counsel.el (counsel-package): Add func to manage packages., Oleh Krehel, 2017/04/08
- [elpa] master b9c52be 301/348: counsel.el (counsel-git): Add "x" action, Oleh Krehel, 2017/04/08
- [elpa] master dbeb5b1 303/348: Ensure counsel-M-x preserves last-command, Oleh Krehel, 2017/04/08
- [elpa] master ae3ca26 117/348: counsel.el (counsel-locate-action-extern): Add w32 support, Oleh Krehel, 2017/04/08
- [elpa] master 3e651a3 116/348: Make swiper-all use point positions instead of line positions, Oleh Krehel, 2017/04/08
- [elpa] master ef3f010 128/348: ivy.el (ivy--insert-prompt): Improve the extra "\n" logic, Oleh Krehel, 2017/04/08
- [elpa] master 870112e 176/348: counsel.el (counsel-ag-function): Use sync on remote, Oleh Krehel, 2017/04/08
- [elpa] master 1914ecd 203/348: counsel.el (counsel-recoll-function): Add shell-quote-argument, Oleh Krehel, 2017/04/08
- [elpa] master f0e49d5 213/348: Improve recursive minibuffers with two emacsclients,
Oleh Krehel <=
- [elpa] master df9ad89 220/348: counsel.el (counsel-rpm): New command, Oleh Krehel, 2017/04/08
- [elpa] master aea4919 225/348: Shrink ivy back to ivy-height after dispatching actions., Oleh Krehel, 2017/04/08
- [elpa] master 88bf299 228/348: counsel.el (counsel-recentf): Remove properties from recentf-list, Oleh Krehel, 2017/04/08
- [elpa] master 576a1e3 232/348: Revert "ivy.el (ivy-call): setq default-directory instead of let", Oleh Krehel, 2017/04/08
- [elpa] master 50bb6b3 250/348: ivy.el (ivy-call): Call the action in ivy-state-buffer, Oleh Krehel, 2017/04/08
- [elpa] master f9f2c8c 251/348: counsel.el (counsel-bookmark-avoid-dired): Add, Oleh Krehel, 2017/04/08
- [elpa] master 123f9e1 258/348: swiper-all should consider magit stash buffers too, Oleh Krehel, 2017/04/08
- [elpa] master 4dd650c 257/348: Make counsel-ag prompt for extra args when using prefix arg., Oleh Krehel, 2017/04/08
- [elpa] master a77a265 263/348: Set `outline-regexp' directory local, Oleh Krehel, 2017/04/08
- [elpa] master 109170b 264/348: Remap `backward-delete-char-untabify' to `ivy-backward-delete-char', Oleh Krehel, 2017/04/08