diff options
| author | Eli Zaretskii | 2020-04-28 20:22:50 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2020-04-28 20:22:50 +0300 |
| commit | d83cc05a73645f23558590e0415ecb7d5ae2d02d (patch) | |
| tree | 4e9e9e1e6147130a0f0d0b1cada9e851f00ab833 | |
| parent | 16fed05ba85c3d92d3c913657dd50a648ad3884a (diff) | |
| download | emacs-d83cc05a73645f23558590e0415ecb7d5ae2d02d.tar.gz 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)
| -rw-r--r-- | lisp/erc/erc-backend.el | 3 |
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." | |||
| 466 | The length is specified in `erc-split-line-length'. | 466 | The length is specified in `erc-split-line-length'. |
| 467 | 467 | ||
| 468 | Currently this is called by `erc-send-input'." | 468 | Currently this is called by `erc-send-input'." |
| 469 | (let ((charset (car (erc-coding-system-for-target nil)))) | 469 | (let* ((coding (erc-coding-system-for-target nil)) |
| 470 | (charset (if (consp coding) (car coding) coding))) | ||
| 470 | (with-temp-buffer | 471 | (with-temp-buffer |
| 471 | (insert longline) | 472 | (insert longline) |
| 472 | ;; The line lengths are in octets, not characters (because these | 473 | ;; The line lengths are in octets, not characters (because these |