From: Oleh Krehel Date: Mon, 29 Feb 2016 07:57:52 +0000 (+0100) Subject: ivy.el (ivy-switch-buffer): Don't fall back to switch-to-buffer X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/d0857656ca48c4608e26a30d3bdc45822ace01c7 ivy.el (ivy-switch-buffer): Don't fall back to switch-to-buffer Fixes #410 --- diff --git a/ivy.el b/ivy.el index 5ebdb4a8b..2ddcbb6b1 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 ()