From: ueno <ueno>
Date: Tue, 3 Jun 2003 08:04:52 +0000 (+0000)
Subject: (cf. the last paragraph of `kill-buffer' docstring)
X-Git-Tag: strict-naming-branchpoint~6
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f874e9630986ed588ee1da8513f3dd2a24c8f7d8;p=elisp%2Friece.git

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

* riece-rdcc.el (riece-rdcc-sentinel): Don't call delete-process
explicitly.
* riece-ndcc.el: Don't call delete-process explicitly.
* riece-server.el (riece-close-server-process): Don't call
delete-process explicitly unless riece-debug == t.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9155fba..fe9d0b2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
 2003-06-03  Daiki Ueno  <ueno@unixuser.org>
 
+	* riece-rdcc.el (riece-rdcc-sentinel): Don't call delete-process
+	explicitly.
+	* riece-ndcc.el: Don't call delete-process explicitly.
+	* riece-server.el (riece-close-server-process): Don't call
+	delete-process explicitly unless riece-debug == t.
+
+2003-06-03  Daiki Ueno  <ueno@unixuser.org>
+
 	* riece-inlines.el (scandinavian-downcase): New inline function.
 	(scandinavian-equal-ignore-case): Rename from
 	string-equal-ignore-case.
diff --git a/lisp/riece-ndcc.el b/lisp/riece-ndcc.el
index 74b6375..78a73d7 100644
--- 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
diff --git a/lisp/riece-rdcc.el b/lisp/riece-rdcc.el
index b77c978..e02b587 100644
--- a/lisp/riece-rdcc.el
+++ b/lisp/riece-rdcc.el
@@ -115,8 +115,7 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
 (defun riece-rdcc-server-sentinel (process status)
   (with-current-buffer (process-buffer process)
     (message "Sending %s...done" riece-rdcc-request-file))
-  (kill-buffer (process-buffer process))
-  (delete-process process))
+  (kill-buffer (process-buffer process)))
 
 (defun riece-command-dcc-send (user file)
   (interactive
@@ -186,8 +185,7 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
     (let ((coding-system-for-write 'binary)
 	  jka-compr-compression-info-list jam-zcat-filename-list)
       (write-region (point-min) (point-max) riece-rdcc-request-file)))
-  (kill-buffer (process-buffer process))
-  (delete-process process))
+  (kill-buffer (process-buffer process)))
 
 (defun riece-rdcc-decode-address (address)
   (with-temp-buffer
diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index 4ff95c7..20aedf8 100644
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -177,14 +177,14 @@ the `riece-server-keyword-map' variable."
       (set-process-filter process nil))
   (if (eq 'riece-sentinel (process-sentinel process))
       (set-process-sentinel process nil))
-  (when (memq (process-status process) '(open run))
-    (riece-process-send-string process
-			       (if quit-message
-				   (format "QUIT :%s\r\n" quit-message)
-				 "QUIT\r\n"))
-    (unless riece-debug
-      (kill-buffer (process-buffer process))))
-  (delete-process process))
+  (if (memq (process-status process) '(open run))
+      (riece-process-send-string process
+				 (if quit-message
+				     (format "QUIT :%s\r\n" quit-message)
+				   "QUIT\r\n")))
+  (if riece-debug
+      (delete-process process)
+    (kill-buffer (process-buffer process))))
 
 (eval-when-compile
   (autoload 'riece-exit "riece"))