aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/erc
diff options
context:
space:
mode:
authorDavid Edmondson2016-02-04 16:52:01 +1100
committerLars Ingebrigtsen2016-02-04 18:00:50 +1100
commit8b35b109dd00e42a06f1031c49c471882460184f (patch)
tree968fbec3fbd90e3ca011264680df9b42edbfe179 /lisp/erc
parent5898da8210af7953e638ddf7821c05260979c3f0 (diff)
downloademacs-8b35b109dd00e42a06f1031c49c471882460184f.tar.gz
emacs-8b35b109dd00e42a06f1031c49c471882460184f.zip
Make erc work better when encountering unknown prefix chars
* lisp/erc/erc.el (erc-channel-receive-names): Output a warning instead of erroring out on unknown prefix chars (bug#22380).
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/erc.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 56317b83a98..b7f40a878a9 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -4830,7 +4830,7 @@ channel."
4830 ((pred (eq op-ch)) op) 4830 ((pred (eq op-ch)) op)
4831 ((pred (eq adm-ch)) admin) 4831 ((pred (eq adm-ch)) admin)
4832 ((pred (eq own-ch)) owner) 4832 ((pred (eq own-ch)) owner)
4833 (_ (error "Unknown prefix char `%S'" ch) voice)) 4833 (_ (message "Unknown prefix char `%S'" ch) voice))
4834 'on))) 4834 'on)))
4835 (when updatep 4835 (when updatep
4836 ;; If we didn't issue the NAMES request (consider two clients 4836 ;; If we didn't issue the NAMES request (consider two clients