(cf. the last paragraph of `kill-buffer' docstring)

[riece] / lisp / riece-ndcc.el

diff --git a/lisp/riece-ndcc.el b/lisp/riece-ndcc.el
index 0ae4b85..78a73d7 100644 (file)
--- a/lisp/riece-ndcc.el
+++ b/lisp/riece-ndcc.el
@@ -71,7 +71,6 @@ Only used for sending files."
               (substring (process-name process) 0 (match-beginning 0)))))
       (save-excursion
        (set-buffer (process-buffer (get-process parent-name)))
-       (delete-process parent-name)
        (goto-char (point-min))
        (while (not (eobp))
          (process-send-region process
@@ -80,9 +79,9 @@ Only used for sending files."
          (message "Sending %s...(%d/%d)"
                   (buffer-file-name) (1- (point)) (buffer-size)))
        (message "Sending %s...done"
-                (buffer-file-name))))
+                (buffer-file-name)))
+      (kill-buffer (process-buffer (get-process parent-name))))
     (kill-buffer (process-buffer process))
-    (delete-process process)))
 
 (defun riece-command-dcc-send (user file)
   (interactive
@@ -152,7 +151,8 @@ Only used for sending files."
                             (car (car requests))
                             (nth 1 (car requests))
                             (nth 4 (car requests))))
-             (setq requests (cdr requests)))))
+             (setq index (1+ index)
+                   requests (cdr requests)))))
        (let ((number (read-string "Request#: ")))
          (unless (string-match "^[0-9]+$" number)
            (error "Not a number"))
@@ -169,6 +169,7 @@ Only used for sending files."
                   "DCC" " *DCC*"
                   (riece-ndcc-decode-address (nth 2 request))
                   (nth 3 request))))
+    (setq riece-rdcc-requests (delq request riece-rdcc-requests))
     (with-current-buffer (process-buffer process)
       (set-buffer-multibyte nil)
       (buffer-disable-undo)
@@ -190,7 +191,7 @@ Only used for sending files."
            (port (string-to-number (match-string 3 message)))
            (size (string-to-number (match-string 4 message)))
            (buffer (if (riece-channel-p target)
-                       (cdr (riece-identity-assoc-no-server
+                       (cdr (riece-identity-assoc
                              (riece-make-identity target)
                              riece-channel-buffer-alist))))
            (user (riece-prefix-nickname prefix)))