diff options
| author | Miles Bader <miles@gnu.org> | 2006-08-03 05:10:38 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-08-03 05:10:38 +0000 |
| commit | 2e3ef421a9e7888ed48241bbeecedaeefb58ab54 (patch) | |
| tree | d7a59eb24269a42164aff762ed8b4c952293cdac /lisp/erc/erc-backend.el | |
| parent | 6b2fcbb546b8b69b2eef40c5042439d3f822bec7 (diff) | |
| download | emacs-2e3ef421a9e7888ed48241bbeecedaeefb58ab54.tar.gz emacs-2e3ef421a9e7888ed48241bbeecedaeefb58ab54.tar.bz2 emacs-2e3ef421a9e7888ed48241bbeecedaeefb58ab54.zip | |
Merge from erc--emacs--21
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-379
Creator: Michael Olson <mwolson@gnu.org>
Diffstat (limited to 'lisp/erc/erc-backend.el')
| -rw-r--r-- | lisp/erc/erc-backend.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index 7dce9e4bf01..705ca7a9e63 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -563,11 +563,12 @@ action." "Return the coding system or cons cell appropriate for TARGET. This is determined via `erc-encoding-coding-alist' or `erc-server-coding-system'." - (or (let ((case-fold-search t)) - (catch 'match - (dolist (pat erc-encoding-coding-alist) - (when (string-match (car pat) target) - (throw 'match (cdr pat)))))) + (or (when target + (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)) |