[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 3e1e905 083/399: Fix virtual buffers in counsel-switch-buf
From: |
Oleh Krehel |
Subject: |
[elpa] master 3e1e905 083/399: Fix virtual buffers in counsel-switch-buffer |
Date: |
Sat, 20 Jul 2019 14:56:53 -0400 (EDT) |
branch: master
commit 3e1e905847d0281ef7ce9f289c357aa46b9b643d
Author: Dario Gjorgjevski <address@hidden>
Commit: Oleh Krehel <address@hidden>
Fix virtual buffers in counsel-switch-buffer
We need to use `ivy--virtual-buffers' rather than `current' when
dealing with virtual buffers.
Fixes #1971
---
counsel.el | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/counsel.el b/counsel.el
index 22ce249..450bab2 100644
--- a/counsel.el
+++ b/counsel.el
@@ -5073,16 +5073,18 @@ The buffers are those opened during a session of
`counsel-switch-buffer'."
(defun counsel--switch-buffer-update-fn ()
(unless counsel--switch-buffer-previous-buffers
(setq counsel--switch-buffer-previous-buffers (buffer-list)))
- (let ((current (ivy-state-current ivy-last)))
- (cond ((get-buffer current)
- (ivy-call))
- ((and ivy-use-virtual-buffers (file-exists-p current))
- (let ((buf (find-file-noselect current)))
- (push buf counsel--switch-buffer-temporary-buffers)
- (ivy-call)))
- (t
- (with-ivy-window
- (switch-to-buffer (ivy-state-buffer ivy-last)))))))
+ (let* ((current (ivy-state-current ivy-last))
+ (virtual (assoc current ivy--virtual-buffers)))
+ (cond
+ ((get-buffer current)
+ (ivy-call))
+ ((and virtual (file-exists-p (cdr virtual)))
+ (let ((buf (find-file-noselect (cdr virtual))))
+ (push buf counsel--switch-buffer-temporary-buffers)
+ (ivy-call)))
+ (t
+ (with-ivy-window
+ (switch-to-buffer (ivy-state-buffer ivy-last)))))))
;;;###autoload
(defun counsel-switch-buffer ()
- [elpa] master 4e07e6f 048/399: ivy.el (ivy-make-magic-action): Add docstring to the generated lambda, (continued)
- [elpa] master 4e07e6f 048/399: ivy.el (ivy-make-magic-action): Add docstring to the generated lambda, Oleh Krehel, 2019/07/20
- [elpa] master 8a40934 062/399: counsel.el: Clean up compile candidates list, Oleh Krehel, 2019/07/20
- [elpa] master 0c30e3f 063/399: counsel.el: Minor compile history cleanup, Oleh Krehel, 2019/07/20
- [elpa] master 114ae96 070/399: counsel.el: Find project root more flexibly, Oleh Krehel, 2019/07/20
- [elpa] master 5aa263c 079/399: counsel.el (counsel-compile-make-pattern): Fix regex, Oleh Krehel, 2019/07/20
- [elpa] master cc50da2 080/399: counsel.el (counsel-dired-jump-args): Fix -type d, Oleh Krehel, 2019/07/20
- [elpa] master a473519 086/399: Fix error in ivy-make-magic-action, Oleh Krehel, 2019/07/20
- [elpa] master 9ce9e4e 090/399: counsel.el (counsel-compile-phony-pattern): Fixup, Oleh Krehel, 2019/07/20
- [elpa] master 1046fc7 095/399: ivy.el (ivy-avy): Use non-obsolete avy-process, Oleh Krehel, 2019/07/20
- [elpa] master 27add46 092/399: Anchor pcre lookaround patterns to bol, Oleh Krehel, 2019/07/20
- [elpa] master 3e1e905 083/399: Fix virtual buffers in counsel-switch-buffer,
Oleh Krehel <=
- [elpa] master cbdc9c9 078/399: counsel.el (counsel--compile-get-make-targets): Rename, Oleh Krehel, 2019/07/20
- [elpa] master e7146e5 089/399: counsel.el (counsel-git-grep-count-function): Fix, Oleh Krehel, 2019/07/20
- [elpa] master b180abf 087/399: counsel.el (counsel-compile): clean-up get-make-targets, Oleh Krehel, 2019/07/20
- [elpa] master 456e575 093/399: Don't bury killed buffers after counsel-switch-buffer, Oleh Krehel, 2019/07/20
- [elpa] master 1c84179 098/399: counsel.el (counsel-rg): Add an example to the doc, Oleh Krehel, 2019/07/20
- [elpa] master b154260 097/399: counsel.el (counsel-grep): Fix TRAMP problems, Oleh Krehel, 2019/07/20
- [elpa] master adab07d 101/399: counsel.el: Simplify counsel-git-grep, Oleh Krehel, 2019/07/20
- [elpa] master 5b4dbbc 096/399: ivy.el: Silence byte-compiler, Oleh Krehel, 2019/07/20
- [elpa] master 3954bfe 081/399: counsel.el (counsel-compile): Don't modify compilation-start-hook permanently, Oleh Krehel, 2019/07/20
- [elpa] master d92d43a 085/399: counsel.el (counsel-compile-root-functions): Tidy, Oleh Krehel, 2019/07/20