<<<<<<< .working /* The tcl binding might have deleted the current user and the * current channel, so we'll now have to re-check whether they * both still exist. */ chan = findchan(chname); if (!chan) { if (ch_dname) chan = findchan_by_dname(ch_dname); else chan = findchan_by_dname(chname); } if (!chan) /* The channel doesn't exist anymore, so get out of here. */ goto exit; /* The record saved in the channel record always gets updated, so we can use that. */ u = m->user; ======= >>>>>>> .merge-right.r3365