bug-gnu-emacs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#12051: 24.1; rcirc-send-message doesn't take multibyte into account.


From: Eli Zaretskii
Subject: bug#12051: 24.1; rcirc-send-message doesn't take multibyte into account.
Date: Tue, 14 Aug 2012 18:45:46 +0300

> From: Leo <address@hidden>
> Date: Mon, 13 Aug 2012 09:53:42 +0800
> Cc: address@hidden
> 
> 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?





reply via email to

[Prev in Thread] Current Thread [Next in Thread]