Commit 390c8805 authored by Lars Ingebrigtsen's avatar Lars Ingebrigtsen

Fix erc-dcc server-close code and fix compilation warning

* lisp/erc/erc-dcc.el (erc-dcc-get-filter): We receive unibyte
data, so no need to convert to unibyte.
(erc-dcc-send-filter): Kill the process before killing the buffer
so that we're not queried about killing the process.
parent bc7e771f
Pipeline #2033 failed with stage
in 88 minutes and 47 seconds
......@@ -813,8 +813,8 @@ bytes sent."
?s (number-to-string (- sent-marker (point-min))))
(setq erc-dcc-list (delete elt erc-dcc-list))
(set-buffer-modified-p nil)
(kill-buffer (current-buffer))
(delete-process proc))
(delete-process proc)
(kill-buffer (current-buffer)))
((<= confirmed-marker sent-marker)
(while (and (< (- sent-marker confirmed-marker)
(or erc-dcc-pump-bytes
......@@ -827,8 +827,8 @@ bytes sent."
(marker-position confirmed-marker)
(marker-position sent-marker)))
(set-buffer-modified-p nil)
(kill-buffer (current-buffer))
(delete-process proc))))))
(delete-process proc)
(kill-buffer (current-buffer)))))))
(defun erc-dcc-display-send (proc)
......@@ -978,8 +978,9 @@ rather than every 1024 byte block, but nobody seems to care."
(let ((inhibit-read-only t)
(goto-char (point-max))
(if str
(insert (string-make-unibyte str)))
(when str
(cl-assert (not (multibyte-string-p str)))
(insert str))
(when (> (point-max) erc-dcc-receive-cache)
(erc-dcc-append-contents (current-buffer) erc-dcc-file-name))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment