Show
Ignore:
Timestamp:
07/16/06 08:36:52 (2 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lisp/erc/erc-backend.el

    r4058 r4111  
    564564This is determined via `erc-encoding-coding-alist' or 
    565565`erc-server-coding-system'." 
    566   (or (cdr (assoc target erc-encoding-coding-alist)) 
     566  (or (let ((case-fold-search t)) 
     567        (catch 'match 
     568          (dolist (pat erc-encoding-coding-alist) 
     569            (when (string-match (car pat) target) 
     570              (throw 'match (cdr pat)))))) 
    567571      (and (functionp erc-server-coding-system) 
    568572           (funcall erc-server-coding-system)) 
    …… 
    850854                  'erc-default-server-functions))) 
    851855    (run-hook-with-args-until-success hook process message) 
    852     (with-current-buffer (erc-server-buffer) 
    853       (run-hook-with-args 'erc-timer-hook (erc-current-time))))) 
     856    (let ((server-buffer (erc-server-buffer))) 
     857      (when (buffer-live-p server-buffer) 
     858        (with-current-buffer server-buffer 
     859          (run-hook-with-args 'erc-timer-hook (erc-current-time))))))) 
    854860 
    855861(add-hook 'erc-default-server-functions 'erc-handle-unknown-server-response)