From 75b41a38dd0735fe63457e12741656c63972d3ce Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Tue, 26 Nov 2019 22:35:04 +0100 Subject: Fix previous change to (next|previous)-buffer * lisp/window.el (next-buffer, previous-buffer): If no other buffer is available, signal 'user-error' only when called interactively. --- lisp/window.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lisp/window.el') diff --git a/lisp/window.el b/lisp/window.el index c8a5816b8c9..c750ea71ead 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -4850,7 +4850,8 @@ minibuffer window or is dedicated to its buffer." (user-error "Window is strongly dedicated to its buffer")) (t (dotimes (_ (or arg 1)) - (unless (switch-to-next-buffer) + (when (and (not (switch-to-next-buffer)) + (called-interactively-p 'interactive)) (user-error "No next buffer")))))) (defun previous-buffer (&optional arg) @@ -4865,7 +4866,8 @@ minibuffer window or is dedicated to its buffer." (user-error "Window is strongly dedicated to its buffer")) (t (dotimes (_ (or arg 1)) - (unless (switch-to-prev-buffer) + (when (and (not (switch-to-prev-buffer)) + (called-interactively-p 'interactive)) (user-error "No previous buffer")))))) (defun delete-windows-on (&optional buffer-or-name frame) -- cgit v1.2.1