2 files changed, 9 insertions, 3 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index aeae366a1d5..d56947d5e71 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-16  Glenn Morris  <rgm@gnu.org>
+
+        * erc-dcc.el (erc-dcc-server): Silence warning about obsolete function
+        behind fboundp test.
+
 2009-01-09  Glenn Morris  <rgm@gnu.org>
 
         * erc.el (erc-input-message): Replace last-command-char with
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 754b07e8218..4dda869315c 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -1,7 +1,7 @@
 ;;; erc-dcc.el --- CTCP DCC module for ERC
 
-;; Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004, 2006, 2007, 2008, 2009
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004, 2006, 2007,
+;;   2008, 2009  Free Software Foundation, Inc.
 
 ;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu>
 ;;         Noah Friedman <friedman@prep.ai.mit.edu>
@@ -377,7 +377,8 @@ created subprocess, or nil."
               (when (fboundp 'set-process-coding-system)
                 (set-process-coding-system process 'binary 'binary))
               (when (fboundp 'set-process-filter-multibyte)
-                (set-process-filter-multibyte process nil))))
+                (with-no-warnings       ; obsolete since 23.1
+                  (set-process-filter-multibyte process nil)))))
         (file-error
          (unless (and (string= "Cannot bind server socket" (cadr err))
                       (string= "address already in use" (caddr err)))