[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Erbot-cvs] erbot ChangeLog erbot.el
From: |
Vivek Dasmohapatra |
Subject: |
[Erbot-cvs] erbot ChangeLog erbot.el |
Date: |
Sat, 31 Dec 2005 00:54:31 +0000 |
CVSROOT: /sources/erbot
Module name: erbot
Branch:
Changes by: Vivek Dasmohapatra <address@hidden> 05/12/31 00:54:31
Modified files:
. : ChangeLog erbot.el
Log message:
Merge in the clean encoding/decoding changes from fsbot on pike
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/erbot/erbot/ChangeLog.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/erbot/erbot/erbot.el.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
Patches:
Index: erbot/ChangeLog
diff -u erbot/ChangeLog:1.30 erbot/ChangeLog:1.31
--- erbot/ChangeLog:1.30 Thu Nov 10 06:01:13 2005
+++ erbot/ChangeLog Sat Dec 31 00:54:31 2005
@@ -1,3 +1,11 @@
+2005-12-30 Vivek Dasmohapatra <address@hidden>
+
+ * erbot.el (erbot-remote): Decode the incoming data properly
+ paying attention to erc's inbound coding system.
+ (erbot-reply): Now that the inbound data is (hopefully) cleanly
+ decoded we shouldn't need to force the outbound coding.
+ In emacs21, mule-ucs may be required for this to work.
+
2005-11-10 D Goel <address@hidden>
* erbot.el (erbot-safep): Make a minor change, to try to render
@@ -35,7 +43,7 @@
2005-10-05 D Goel <address@hidden>
* erbot.el (erbot-join-servers): `erc-compute-port' seems to be
- undefined for my older ERC (4.0 $Revision: 1.30 $). So, I
+ undefined for my older ERC (4.0 $Revision: 1.31 $). So, I
reverted to old behavior when it is undefined. Did I do it right?
2005-10-05 Michael Olson <address@hidden>
Index: erbot/erbot.el
diff -u erbot/erbot.el:1.45 erbot/erbot.el:1.46
--- erbot/erbot.el:1.45 Thu Nov 10 06:01:13 2005
+++ erbot/erbot.el Sat Dec 31 00:54:31 2005
@@ -479,6 +479,9 @@
(nth 1 cmdargs))
(t (aref parsed 3)))))
(erbot-end-user-nick nick)
+ (csys (erc-coding-system-for-target tgt))
+ (code-in (if (consp csys) (cdr csys) csys))
+ (code-out (if (consp csys) (car csys) csys))
)
;; changing the structure here..
;; also changing erbot-command to erbot-reply..
@@ -494,6 +497,12 @@
;;(setq fs-nick nick)
;;(setq erbn-nick nick)
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;; make sure we decode the raw text we received...
+ (unless (multibyte-string-p msg)
+ (setq msg (decode-coding-string msg code-in)))
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
(let ((msgg
(erbeng-main msg proc nick tgt nil userinfo)))
;; erbot-reply needs a correct buffer...
@@ -559,7 +568,7 @@
(unless (stringp main-reply)
(setq main-reply (format "%S" main-reply)))
(let (
- linen line3
+ linen
(me (or (erc-current-nick) erbot-nick))
;;(if (and erbot-commands
;; (string-match (concat "^" (regexp-quote me)
@@ -640,11 +649,11 @@
(set-marker erc-insert-marker (point))
(goto-char (point-max))
(setq linen (concat line "\n"))
- (setq line3
- (string-make-unibyte
- (encode-coding-string linen 'utf-8)))
-
- (erc-process-input-line line3 t multiline-p))
+ ;; fledermaus: I used to force the encoding here, but I now
+ ;; think that's the wrong thing to do. Hopefully if the data-path
+ ;; through erc->fsbot->erc is clean, erc will do the right thing
+ ;; to outbound data.
+ (erc-process-input-line linen t multiline-p))
lines))))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Erbot-cvs] erbot ChangeLog erbot.el,
Vivek Dasmohapatra <=