From: ueno Date: Tue, 3 Sep 2002 04:22:48 +0000 (+0000) Subject: * liece-handle.el (liece-handle-quit-message): Don't use X-Git-Tag: liece-1_4_9~16 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=7da278a9224684ce411a8f8839111ee359b8ea9e;p=elisp%2Fliece.git * liece-handle.el (liece-handle-quit-message): Don't use liece-nick-mark-as-apart. (liece-handle-join-message): Ditto. [cf. ] --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a696fde..4aa4047 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2002-09-03 Daiki Ueno + + * liece-handle.el (liece-handle-quit-message): Don't use + liece-nick-mark-as-apart. + (liece-handle-join-message): Ditto. + [cf. ] + 2002-09-01 Daiki Ueno * liece-handle.el (liece-handle-mode-message): The arglist of diff --git a/lisp/liece-handle.el b/lisp/liece-handle.el index d2e6afb..b481871 100644 --- a/lisp/liece-handle.el +++ b/lisp/liece-handle.el @@ -214,7 +214,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 @@ -390,9 +390,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 @@ -400,7 +398,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) @@ -408,17 +405,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")