From 11277f5cc09a50109d75f6ef99f0144916be8e55 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Thu, 11 Aug 2005 08:03:46 +0000
Subject: [PATCH] * riece-ruby.el (riece-ruby-run-exit-handler): Call
 riece-ruby-clear if exit-handler is specified. (riece-ruby-exit-handler):
 Don't call riece-ruby-clear.

---
 lisp/ChangeLog     | 4 +++-
 lisp/riece-rdcc.el | 3 +--
 lisp/riece-ruby.el | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 53d8666..9723310 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,7 +6,9 @@
 	(riece-ruby-filter): Fixed regexp; fixed argument order of
 	output-handler.
 	(riece-ruby-run-exit-handler): Remove exit-handler entry before
-	running it to avoid recursion.
+	running it to avoid recursion; call riece-ruby-clear if
+	exit-handler is specified.
+	(riece-ruby-exit-handler): Don't call riece-ruby-clear.
 
 	* riece-rdcc.el: Use riece-ruby.
 
diff --git a/lisp/riece-rdcc.el b/lisp/riece-rdcc.el
index 1f8ddce..f977f36 100644
--- a/lisp/riece-rdcc.el
+++ b/lisp/riece-rdcc.el
@@ -129,8 +129,7 @@ end
 
 (defun riece-rdcc-exit-handler (name)
   (message "Sending %s...done"
-	   (riece-ruby-property name 'riece-rdcc-request-file))
-  (riece-ruby-clear name))
+	   (riece-ruby-property name 'riece-rdcc-request-file)))
 
 (defun riece-command-dcc-send (user file)
   (interactive
diff --git a/lisp/riece-ruby.el b/lisp/riece-ruby.el
index 80036f6..fe5c6f1 100644
--- a/lisp/riece-ruby.el
+++ b/lisp/riece-ruby.el
@@ -218,7 +218,8 @@ Use `riece-ruby-set-property' to set this variable.")
 	(progn
 	  (setq riece-ruby-exit-handler-alist
 		(delq entry riece-ruby-exit-handler-alist))
-	  (funcall (cdr entry) (car entry))))))
+	  (funcall (cdr entry) (car entry))
+	  (riece-ruby-clear name)))))
 
 (defun riece-ruby-sentinel (process status)
   (kill-buffer (process-buffer process)))
@@ -338,8 +339,7 @@ Use `riece-ruby-set-property' to set this variable.")
      (riece-make-message (riece-current-nickname)
 			 (riece-ruby-property name 'riece-ruby-target)
 			 data
-			 'notice))
-    (riece-ruby-clear name)))
+			 'notice))))
 
 (defun riece-ruby-display-message-function (message)
   (if (and riece-ruby-enabled
-- 
2.25.1