summaryrefslogtreecommitdiff
path: root/lisp/erc/erc-backend.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2020-04-28 20:22:50 +0300
committerEli Zaretskii <eliz@gnu.org>2020-04-28 20:22:50 +0300
commitd83cc05a73645f23558590e0415ecb7d5ae2d02d (patch)
tree4e9e9e1e6147130a0f0d0b1cada9e851f00ab833 /lisp/erc/erc-backend.el
parent16fed05ba85c3d92d3c913657dd50a648ad3884a (diff)
downloademacs-d83cc05a73645f23558590e0415ecb7d5ae2d02d.tar.gz
emacs-d83cc05a73645f23558590e0415ecb7d5ae2d02d.tar.bz2
emacs-d83cc05a73645f23558590e0415ecb7d5ae2d02d.zip
Fix error in ERC when 'erc-server-coding-system' is customized
* lisp/erc/erc-backend.el (erc-split-line): Handle the case where 'erc-coding-system-for-target' returns a coding-system's symbol. (Bug#40914)
Diffstat (limited to 'lisp/erc/erc-backend.el')
-rw-r--r--lisp/erc/erc-backend.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 0e3495e139a..526e854beca 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -466,7 +466,8 @@ If this is set to nil, never try to reconnect."
The length is specified in `erc-split-line-length'.
Currently this is called by `erc-send-input'."
- (let ((charset (car (erc-coding-system-for-target nil))))
+ (let* ((coding (erc-coding-system-for-target nil))
+ (charset (if (consp coding) (car coding) coding)))
(with-temp-buffer
(insert longline)
;; The line lengths are in octets, not characters (because these