aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2006-06-23 13:23:39 +0000
committerEli Zaretskii2006-06-23 13:23:39 +0000
commitaac5d1fdcef39ff30bdb47192791b4bf6c08b5d4 (patch)
treee959bf07c07a70283b04383ac5ad6131174a5dcf
parent81711dbab8efbf1fbf15a711605aae6b55e9a861 (diff)
downloademacs-aac5d1fdcef39ff30bdb47192791b4bf6c08b5d4.tar.gz
emacs-aac5d1fdcef39ff30bdb47192791b4bf6c08b5d4.zip
(rcirc-mode): Fix initialization of coding systems based on
rcirc-coding-system-alist.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/rcirc.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 75b758b0d5d..1d63d52da50 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-06-23 Ryan Yeske <rcyeske@gmail.com>
2
3 * net/rcirc.el (rcirc-mode): Fix initialization of coding systems
4 based on rcirc-coding-system-alist.
5
12006-06-23 Martin Rudalics <rudalics@gmx.at> 62006-06-23 Martin Rudalics <rudalics@gmx.at>
2 7
3 * cus-edit.el (customize-apropos): A better error message. 8 * cus-edit.el (customize-apropos): A better error message.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index a0b328413b0..683d7c6f3c1 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -719,8 +719,8 @@ If NOTICEP is non-nil, send a notice instead of privmsg."
719 (serv (if (consp (car i)) (cdar i) ""))) 719 (serv (if (consp (car i)) (cdar i) "")))
720 (when (and (string-match chan (or target "")) 720 (when (and (string-match chan (or target ""))
721 (string-match serv (rcirc-server-name process))) 721 (string-match serv (rcirc-server-name process)))
722 (setq rcirc-decode-coding-system (if (consp (cdr i)) (cadr i) i) 722 (setq rcirc-decode-coding-system (if (consp (cdr i)) (cadr i) (cdr i))
723 rcirc-encode-coding-system (if (consp (cdr i)) (cddr i) i))))) 723 rcirc-encode-coding-system (if (consp (cdr i)) (cddr i) (cdr i))))))
724 724
725 ;; setup the prompt and markers 725 ;; setup the prompt and markers
726 (make-local-variable 'rcirc-prompt-start-marker) 726 (make-local-variable 'rcirc-prompt-start-marker)