[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master c2788de 082/399: counsel.el (counsel--switch-buffer-update
From: |
Oleh Krehel |
Subject: |
[elpa] master c2788de 082/399: counsel.el (counsel--switch-buffer-update-fn): if to cond |
Date: |
Sat, 20 Jul 2019 14:56:53 -0400 (EDT) |
branch: master
commit c2788de2641347cd1ca3547e6857e0633fac169d
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
counsel.el (counsel--switch-buffer-update-fn): if to cond
---
counsel.el | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/counsel.el b/counsel.el
index 55bebb3..22ce249 100644
--- a/counsel.el
+++ b/counsel.el
@@ -5074,16 +5074,15 @@ The buffers are those opened during a session of
`counsel-switch-buffer'."
(unless counsel--switch-buffer-previous-buffers
(setq counsel--switch-buffer-previous-buffers (buffer-list)))
(let ((current (ivy-state-current ivy-last)))
- ;; This check is necessary, otherwise typing into the completion
- ;; would create empty buffers.
- (if (get-buffer current)
- (ivy-call)
- (if (and ivy-use-virtual-buffers (file-exists-p current))
- (let ((buf (find-file-noselect current)))
- (push buf counsel--switch-buffer-temporary-buffers)
- (ivy-call))
- (with-ivy-window
- (switch-to-buffer (ivy-state-buffer 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)))))))
;;;###autoload
(defun counsel-switch-buffer ()
- [elpa] master adea72f 060/399: counsel.el: Simplify counsel-compile action, (continued)
- [elpa] master adea72f 060/399: counsel.el: Simplify counsel-compile action, Oleh Krehel, 2019/07/20
- [elpa] master 50dc9e6 065/399: counsel.el (counsel--get-build-subdirs): Fix, Oleh Krehel, 2019/07/20
- [elpa] master 4e0d403 066/399: counsel.el (counsel--find-build-subdir): Simplify, Oleh Krehel, 2019/07/20
- [elpa] master 144e7d9 069/399: counsel.el: Clean up recent compile variables, Oleh Krehel, 2019/07/20
- [elpa] master 82e6c54 067/399: counsel.el: Clean up compile make invocation, Oleh Krehel, 2019/07/20
- [elpa] master bb58a29 071/399: counsel.el (counsel-ag): Fix error in non-Git directory, Oleh Krehel, 2019/07/20
- [elpa] master f0d93cf 073/399: counsel.el (counsel-compile): counsel-compile-get-filtered-history, Oleh Krehel, 2019/07/20
- [elpa] master ce0c39e 076/399: counsel.el (counsel--git-root): Rename, Oleh Krehel, 2019/07/20
- [elpa] master a37d4e3 072/399: counsel.el (counsel-compile): fix breakage to subdir recursion, Oleh Krehel, 2019/07/20
- [elpa] master 86c904f 077/399: counsel.el (counsel-compile-root-functions): Change priority, Oleh Krehel, 2019/07/20
- [elpa] master c2788de 082/399: counsel.el (counsel--switch-buffer-update-fn): if to cond,
Oleh Krehel <=
- [elpa] master 1439e8d 064/399: counsel.el: Simplify compile build dir collection, Oleh Krehel, 2019/07/20
- [elpa] master 7e8a362 068/399: counsel.el (counsel--get-make-targets): Clean up, Oleh Krehel, 2019/07/20
- [elpa] master d64b268 074/399: counsel.el (counsel-compile): counsel--get-build-subdirs, Oleh Krehel, 2019/07/20
- [elpa] master 6f0f32f 084/399: counsel.el (counsel-git-grep-count-function): Promote to defcustom, Oleh Krehel, 2019/07/20
- [elpa] master 25336fd 075/399: counsel.el (counsel-compile): counsel-compile-local-builds, Oleh Krehel, 2019/07/20
- [elpa] master db905cc 088/399: counsel.el (counsel-compile-phony-pattern): Use plain regex, Oleh Krehel, 2019/07/20
- [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