Mercurial > emacs

diff lisp/erc/erc-backend.el @ 72249:268989954f79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from erc--emacs--21 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-379 Creator: Michael Olson <mwolson@gnu.org>
author Miles Bader <miles@gnu.org>
date Thu, 03 Aug 2006 05:10:38 +0000
parents 3d0d6e217db9
children 430a916ae2ba
line wrap: on
line diff
--- a/lisp/erc/erc-backend.el	Thu Aug 03 03:35:45 2006 +0000
+++ b/lisp/erc/erc-backend.el	Thu Aug 03 05:10:38 2006 +0000
@@ -563,11 +563,12 @@
   "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))