[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 390c880: Fix erc-dcc server-close code and fix comp
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 390c880: Fix erc-dcc server-close code and fix compilation warning |
Date: |
Thu, 13 Jun 2019 08:35:43 -0400 (EDT) |
branch: master
commit 390c8805c2c4e636c12c5c7e892c3c5e481a0256
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
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.
---
lisp/erc/erc-dcc.el | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index abc3148..2b6f8c9 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -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)
(erc-display-message
@@ -978,8 +978,9 @@ rather than every 1024 byte block, but nobody seems to
care."
(let ((inhibit-read-only t)
received-bytes)
(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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 390c880: Fix erc-dcc server-close code and fix compilation warning,
Lars Ingebrigtsen <=