Synch up with liece-1_4.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ccbb5f..5a81cab 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-03  Daiki Ueno  <ueno@unixuser.org>
+
+       * liece-handle.el (liece-handle-quit-message): Don't use
+       liece-nick-mark-as-apart.
+       (liece-handle-join-message): Ditto.     
+       [cf. <Liece:00080>]
+
 2002-09-01  Daiki Ueno  <ueno@unixuser.org>
 
        * liece-handle.el (liece-handle-mode-message): The arglist of

diff --git a/lisp/liece-handle.el b/lisp/liece-handle.el
index f766e2a..f1783f8 100644 (file)
--- a/lisp/liece-handle.el
+++ b/lisp/liece-handle.el
@@ -218,7 +218,7 @@
     ;; Mark temporary apart, if quitting user is one of our chat partners.
     (when (liece-nick-member prefix liece-current-chat-partners)
       (add-to-list 'chnls prefix)
-      (liece-nick-mark-as-apart prefix))
+      (liece-nick-mark-as-part t prefix))
     (if (liece-handle-check-changes-ignored)
        (return-from liece-handle-quit-message))
     (cond
@@ -394,9 +394,7 @@
      ((string-match " +$" chnl)
       (setq chnl (substring chnl 0 (match-beginning 0)))))
     (setq chnl (liece-channel-virtual chnl))
-    
     (liece-nick-set-user-at-host nick liece-user-at-host)
-    
     (if (liece-nick-equal nick liece-real-nickname)
        (progn
          (and liece-gather-channel-modes
@@ -404,7 +402,6 @@
               (liece-send "MODE %s " (liece-channel-real chnl)))
          (liece-channel-join chnl))
       (liece-nick-join nick chnl))
-    
     (cond
      ((eq flag ?o)
       (liece-channel-set-operator chnl xnick t)
@@ -412,17 +409,15 @@
      ((eq flag ?v)
       (liece-channel-set-voice chnl xnick t)
       (setq xnick (concat "+" xnick))))
-    
     (if (liece-handle-check-changes-ignored)
        (return-from liece-handle-join-message))
-    
+    ;; Restore the private conversation to its original state.
     (when (and (liece-nick-member nick liece-current-chat-partners)
               (get (intern nick liece-obarray) 'part))
       (liece-insert-change (liece-pick-buffer nick)
                            (format (_ "%s has come back as (%s)\n")
                                    nick liece-user-at-host))
-      (liece-nick-unmark-as-apart nick))
-    
+      (liece-nick-mark-as-part nil nick))
     (cond
      (liece-compress-changes
       (let* ((text (format (_ " \\(has\\|have\\) joined channel %s")