aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2009-01-16 03:29:41 +0000
committerGlenn Morris2009-01-16 03:29:41 +0000
commit7d8345daad78d4334e2aa4e5c6e868d6d7e50ade (patch)
tree8748814ae817bb5e7b905f7dfa9b38e34c11b068 /lisp
parent0e47efc5038ea4677b2fdc790f80680841d13951 (diff)
downloademacs-7d8345daad78d4334e2aa4e5c6e868d6d7e50ade.tar.gz
emacs-7d8345daad78d4334e2aa4e5c6e868d6d7e50ade.zip
(erc-dcc-server): Silence warning about obsolete function behind
fboundp test.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/erc/ChangeLog5
-rw-r--r--lisp/erc/erc-dcc.el7
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 @@
12009-01-16 Glenn Morris <rgm@gnu.org>
2
3 * erc-dcc.el (erc-dcc-server): Silence warning about obsolete function
4 behind fboundp test.
5
12009-01-09 Glenn Morris <rgm@gnu.org> 62009-01-09 Glenn Morris <rgm@gnu.org>
2 7
3 * erc.el (erc-input-message): Replace last-command-char with 8 * 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 @@
1;;; erc-dcc.el --- CTCP DCC module for ERC 1;;; erc-dcc.el --- CTCP DCC module for ERC
2 2
3;; Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004, 2006, 2007, 2008, 2009 3;; Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004, 2006, 2007,
4;; Free Software Foundation, Inc. 4;; 2008, 2009 Free Software Foundation, Inc.
5 5
6;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu> 6;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu>
7;; Noah Friedman <friedman@prep.ai.mit.edu> 7;; Noah Friedman <friedman@prep.ai.mit.edu>
@@ -377,7 +377,8 @@ created subprocess, or nil."
377 (when (fboundp 'set-process-coding-system) 377 (when (fboundp 'set-process-coding-system)
378 (set-process-coding-system process 'binary 'binary)) 378 (set-process-coding-system process 'binary 'binary))
379 (when (fboundp 'set-process-filter-multibyte) 379 (when (fboundp 'set-process-filter-multibyte)
380 (set-process-filter-multibyte process nil)))) 380 (with-no-warnings ; obsolete since 23.1
381 (set-process-filter-multibyte process nil)))))
381 (file-error 382 (file-error
382 (unless (and (string= "Cannot bind server socket" (cadr err)) 383 (unless (and (string= "Cannot bind server socket" (cadr err))
383 (string= "address already in use" (caddr err))) 384 (string= "address already in use" (caddr err)))