branch: master
commit d0857656ca48c4608e26a30d3bdc45822ace01c7
Author: Oleh Krehel <[email protected]>
Commit: Oleh Krehel <[email protected]>
ivy.el (ivy-switch-buffer): Don't fall back to switch-to-buffer
Fixes #410
---
ivy.el | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/ivy.el b/ivy.el
index 5ebdb4a..2ddcbb6 100644
--- a/ivy.el
+++ b/ivy.el
@@ -2567,15 +2567,13 @@ Skip buffers that match `ivy-ignore-buffers'."
(defun ivy-switch-buffer ()
"Switch to another buffer."
(interactive)
- (if (not ivy-mode)
- (call-interactively 'switch-to-buffer)
- (let ((this-command 'ivy-switch-buffer))
- (ivy-read "Switch to buffer: " 'internal-complete-buffer
- :matcher #'ivy--switch-buffer-matcher
- :preselect (buffer-name (other-buffer (current-buffer)))
- :action #'ivy--switch-buffer-action
- :keymap ivy-switch-buffer-map
- :caller 'ivy-switch-buffer))))
+ (let ((this-command 'ivy-switch-buffer))
+ (ivy-read "Switch to buffer: " 'internal-complete-buffer
+ :matcher #'ivy--switch-buffer-matcher
+ :preselect (buffer-name (other-buffer (current-buffer)))
+ :action #'ivy--switch-buffer-action
+ :keymap ivy-switch-buffer-map
+ :caller 'ivy-switch-buffer)))
;;;###autoload
(defun ivy-switch-buffer-other-window ()