summaryrefslogtreecommitdiff
path: root/lisp/erc
diff options
context:
space:
mode:
authorGuy Gastineau <strings.stringsandstrings@gmail.com>2022-01-28 23:12:42 -0500
committerF. Jason Park <jp@neverwas.me>2022-03-19 01:47:06 -0700
commitf755daafb92cc61596708a580040784fc269edd4 (patch)
treec9f28ae9650f57b82f7d8f900f258687febef665 /lisp/erc
parent17bd063a67404a13ff719830336693d7cd7f6d79 (diff)
downloademacs-f755daafb92cc61596708a580040784fc269edd4.tar.gz
emacs-f755daafb92cc61596708a580040784fc269edd4.tar.bz2
emacs-f755daafb92cc61596708a580040784fc269edd4.zip
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
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/erc.el7
1 files changed, 1 insertions, 6 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 9ee8d38b026..52fe106f2d1 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1761,12 +1761,7 @@ nil."
(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