[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/erc/erc-backend.el,v
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/erc/erc-backend.el,v |
Date: |
Fri, 14 Jul 2006 02:29:52 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 06/07/14 02:29:50
Index: lisp/erc/erc-backend.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/erc/erc-backend.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- lisp/erc/erc-backend.el 11 Apr 2006 22:09:49 -0000 1.2
+++ lisp/erc/erc-backend.el 14 Jul 2006 02:29:49 -0000 1.3
@@ -563,7 +563,11 @@
"Return the coding system or cons cell appropriate for TARGET.
This is determined via `erc-encoding-coding-alist' or
`erc-server-coding-system'."
- (or (cdr (assoc target erc-encoding-coding-alist))
+ (or (let ((case-fold-search t))
+ (catch 'match
+ (dolist (pat erc-encoding-coding-alist)
+ (when (string-match (car pat) target)
+ (throw 'match (cdr pat))))))
(and (functionp erc-server-coding-system)
(funcall erc-server-coding-system))
erc-server-coding-system))
@@ -849,8 +853,10 @@
(let ((hook (or (erc-get-hook (erc-response.command message))
'erc-default-server-functions)))
(run-hook-with-args-until-success hook process message)
- (with-current-buffer (erc-server-buffer)
- (run-hook-with-args 'erc-timer-hook (erc-current-time)))))
+ (let ((server-buffer (erc-server-buffer)))
+ (when (buffer-live-p server-buffer)
+ (with-current-buffer server-buffer
+ (run-hook-with-args 'erc-timer-hook (erc-current-time)))))))
(add-hook 'erc-default-server-functions 'erc-handle-unknown-server-response)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/erc/erc-backend.el,v,
Miles Bader <=