From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#12051: 24.1; rcirc-send-message doesn't take multibyte into account. Date: Tue, 14 Aug 2012 18:45:46 +0300 Message-ID: <83k3x1jx3p.fsf@gnu.org> References: <87boj3byqy.fsf@acerpad.localdomain> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: dough.gmane.org 1344959192 2587 80.91.229.3 (14 Aug 2012 15:46:32 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 14 Aug 2012 15:46:32 +0000 (UTC) Cc: b4283@bephor.org, 12051@debbugs.gnu.org To: Leo Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Aug 14 17:46:31 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1T1JKB-0001aF-Cg for geb-bug-gnu-emacs@m.gmane.org; Tue, 14 Aug 2012 17:46:31 +0200 Original-Received: from localhost ([::1]:40652 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1JKA-0002Q6-Fo for geb-bug-gnu-emacs@m.gmane.org; Tue, 14 Aug 2012 11:46:30 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:50010) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1JK7-0002NV-79 for bug-gnu-emacs@gnu.org; Tue, 14 Aug 2012 11:46:29 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1JK4-0001wR-6U for bug-gnu-emacs@gnu.org; Tue, 14 Aug 2012 11:46:27 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:46940) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1JK4-0001wM-3F for bug-gnu-emacs@gnu.org; Tue, 14 Aug 2012 11:46:24 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1T1JSQ-0007Pt-87 for bug-gnu-emacs@gnu.org; Tue, 14 Aug 2012 11:55:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 14 Aug 2012 15:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 12051 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 12051-submit@debbugs.gnu.org id=B12051.134495967228468 (code B ref 12051); Tue, 14 Aug 2012 15:55:02 +0000 Original-Received: (at 12051) by debbugs.gnu.org; 14 Aug 2012 15:54:32 +0000 Original-Received: from localhost ([127.0.0.1]:56486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T1JRw-0007P7-5S for submit@debbugs.gnu.org; Tue, 14 Aug 2012 11:54:32 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:47243) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1T1JRt-0007Oz-My for 12051@debbugs.gnu.org; Tue, 14 Aug 2012 11:54:30 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0M8R00H0053ICC00@a-mtaout20.012.net.il> for 12051@debbugs.gnu.org; Tue, 14 Aug 2012 18:45:43 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M8R00GY5546Y070@a-mtaout20.012.net.il>; Tue, 14 Aug 2012 18:45:43 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:63154 Archived-At: > From: Leo > Date: Mon, 13 Aug 2012 09:53:42 +0800 > Cc: 12051@debbugs.gnu.org > > Could you test if the attached patch fixes this problem? Thanks. > > > [2:text/x-patch Hide] > > diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el > index e34b7c79..19f54a8e 100644 > --- a/lisp/net/rcirc.el > +++ b/lisp/net/rcirc.el > @@ -794,26 +794,34 @@ (defun rcirc-buffer-nick (&optional buffer) > (defvar rcirc-max-message-length 420 > "Messages longer than this value will be split.") > > +(defun rcirc-split-message (message) > + (with-temp-buffer > + (insert message) > + (goto-char (point-min)) > + (let (result) > + (while (not (eobp)) > + (goto-char (or (byte-to-position rcirc-max-message-length) > + (point-max))) > + (while (and (not (bobp)) > + (> (length > + (encode-coding-region (point-min) (point) > + rcirc-encode-coding-system t)) > + rcirc-max-message-length)) > + (forward-char -1)) > + (push (delete-and-extract-region (point-min) (point)) result)) > + (nreverse result)))) > + > (defun rcirc-send-message (process target message &optional noticep silent) > "Send TARGET associated with PROCESS a privmsg with text MESSAGE. > If NOTICEP is non-nil, send a notice instead of privmsg. > If SILENT is non-nil, do not print the message in any irc buffer." > ;; max message length is 512 including CRLF > - (let* ((response (if noticep "NOTICE" "PRIVMSG")) > - (oversize (> (length message) rcirc-max-message-length)) > - (text (if oversize > - (substring message 0 rcirc-max-message-length) > - message)) > - (text (if (string= text "") > - " " > - text)) > - (more (if oversize > - (substring message rcirc-max-message-length)))) > + (let ((response (if noticep "NOTICE" "PRIVMSG"))) > (rcirc-get-buffer-create process target) > - (rcirc-send-string process (concat response " " target " :" text)) > - (unless silent > - (rcirc-print process (rcirc-nick process) response target text)) > - (when more (rcirc-send-message process target more noticep)))) > + (dolist (msg (rcirc-split-message message)) > + (rcirc-send-string process (concat response " " target " :" msg)) > + (unless silent > + (rcirc-print process (rcirc-nick process) response target msg))))) Isn't it better and simpler to split the string after it is encoded inside rcirc-send-string?