diff options
author | Glenn Morris <rgm@gnu.org> | 2019-02-15 13:25:31 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2019-02-15 13:25:31 -0800 |
commit | b15e6e456da915e7f398be63dfaaee64bdb6dc2d (patch) | |
tree | e5ec42d20c68774e86461ffc2807d6d90eb35b09 /lisp/erc/erc-dcc.el | |
parent | 613f9740e498c7c55cee6eba1a1407dd3d57b681 (diff) | |
parent | f721084f788dbbbf114c47f87af7d5771b5fb769 (diff) | |
download | emacs-b15e6e456da915e7f398be63dfaaee64bdb6dc2d.tar.gz |
Merge from origin/emacs-26
f721084 (origin/emacs-26) Avoid errors in erc-dcc.el when erc-dcc-ver...
3cba92d Fix faces in compilation messages
Diffstat (limited to 'lisp/erc/erc-dcc.el')
-rw-r--r-- | lisp/erc/erc-dcc.el | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el index 8a40b1454b4..2849e25bf77 100644 --- a/lisp/erc/erc-dcc.el +++ b/lisp/erc/erc-dcc.el @@ -979,17 +979,20 @@ rather than every 1024 byte block, but nobody seems to care." (let ((inhibit-read-only t) received-bytes) (goto-char (point-max)) - (insert (string-make-unibyte str)) + (if str + (insert (string-make-unibyte str))) (when (> (point-max) erc-dcc-receive-cache) (erc-dcc-append-contents (current-buffer) erc-dcc-file-name)) - (setq received-bytes (+ (buffer-size) erc-dcc-byte-count)) + (setq received-bytes (buffer-size)) + (if erc-dcc-byte-count + (setq received-bytes (+ received-bytes erc-dcc-byte-count))) (and erc-dcc-verbose (erc-display-message nil 'notice erc-server-process 'dcc-get-bytes-received - ?f (file-name-nondirectory buffer-file-name) + ?f (file-name-nondirectory (buffer-name)) ?b (number-to-string received-bytes))) (cond ((and (> (plist-get erc-dcc-entry-data :size) 0) @@ -997,7 +1000,7 @@ rather than every 1024 byte block, but nobody seems to care." (erc-display-message nil '(notice error) 'active 'dcc-get-file-too-long - ?f (file-name-nondirectory buffer-file-name)) + ?f (file-name-nondirectory (buffer-name))) (delete-process proc)) (t (process-send-string |