>From 12352c00544c1916210dd15002ef4ffe0f5efdc8 Mon Sep 17 00:00:00 2001 From: Guy Gastineau Date: Fri, 28 Jan 2022 23:12:42 -0500 Subject: [PATCH] Remove redundant checks in erc--switch-to-buffer * lisp/erc/erc.el (erc--switch-to-buffer): Commit f925fc93bac41d7622d1af927e33b0e738ff55b0 "Add `predicate' arg to `read-buffer' and use it for erc-iswitchb" meant to remove this, but it was left behind. (Bug#53617). Copyright-paperwork-exempt: yes --- lisp/erc/erc.el | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 9ee8d38b02..52fe106f2d 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -1761,12 +1761,7 @@ erc--switch-to-buffer (lambda (bufname) (let ((buf (if (consp bufname) (cdr bufname) (get-buffer bufname)))) - (when buf - (erc--buffer-p buf (lambda () t) proc) - (with-current-buffer buf - (and (derived-mode-p 'erc-mode) - (or (null proc) - (eq proc erc-server-process)))))))))) + (and buf (erc--buffer-p buf (lambda () t) proc))))))) (defun erc-switch-to-buffer (&optional arg) "Prompt for an ERC buffer to switch to. When invoked with prefix argument, use all ERC buffers. Without -- 2.34.1