aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/erc
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/erc-dcc.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index 5bc8c2f38b2..fdc209991aa 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -1094,14 +1094,14 @@ Possible values are: ask, auto, ignore."
1094 (pcomplete-here '("auto" "ask" "ignore"))) 1094 (pcomplete-here '("auto" "ask" "ignore")))
1095(defalias 'pcomplete/erc-mode/SREQ 'pcomplete/erc-mode/CREQ) 1095(defalias 'pcomplete/erc-mode/SREQ 'pcomplete/erc-mode/CREQ)
1096 1096
1097(define-obsolete-variable-alias 'erc-dcc-chat-filter-hook
1098 'erc-dcc-chat-filter-functions "24.3")
1099
1097(defvar erc-dcc-chat-filter-functions '(erc-dcc-chat-parse-output) 1100(defvar erc-dcc-chat-filter-functions '(erc-dcc-chat-parse-output)
1098 "Abnormal hook run after parsing (and maybe inserting) a DCC message. 1101 "Abnormal hook run after parsing (and maybe inserting) a DCC message.
1099Each function is called with two arguments: the ERC process and 1102Each function is called with two arguments: the ERC process and
1100the unprocessed output.") 1103the unprocessed output.")
1101 1104
1102(define-obsolete-variable-alias 'erc-dcc-chat-filter-hook
1103 'erc-dcc-chat-filter-functions "24.3")
1104
1105(defvar erc-dcc-chat-mode-map 1105(defvar erc-dcc-chat-mode-map
1106 (let ((map (make-sparse-keymap))) 1106 (let ((map (make-sparse-keymap)))
1107 (define-key map (kbd "RET") 'erc-send-current-line) 1107 (define-key map (kbd "RET") 'erc-send-current-line)