* lisp/mouse.el (mouse-drag-track): Always deactivate the mark before

[gnu-emacs] / lisp / erc / erc-dcc.el

diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 66256ee270e0acbed97e6495c01bb0cd7a41102a..d5cee08c8119e8e511fece07e522acbcb0073e76 100644 (file)
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -1,12 +1,12 @@
 ;;; erc-dcc.el --- CTCP DCC module for ERC
 
-;; Copyright (C) 1993-1995, 1998, 2002-2004, 2006-2012
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1993-1995, 1998, 2002-2004, 2006-2013 Free Software
+;; Foundation, Inc.
 
 ;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu>
 ;;         Noah Friedman <friedman@prep.ai.mit.edu>
 ;;         Per Persson <pp@sno.pp.se>
-;; Maintainer: mlang@delysid.org
+;; Maintainer: FSF
 ;; Keywords: comm, processes
 ;; Created: 1994-01-23
 
@@ -1105,7 +1105,7 @@ Each function is called with two arguments: the ERC process and
 the unprocessed output.")
 
 (define-obsolete-variable-alias 'erc-dcc-chat-filter-hook
-  'erc-dcc-chat-filter-functions "24.2")
+  'erc-dcc-chat-filter-functions "24.3")
 
 (defvar erc-dcc-chat-mode-map
   (let ((map (make-sparse-keymap)))