diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-06-12 13:47:14 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-06-12 13:47:14 +0800 |
| commit | f1a4e679f3b0696089b4fd73717307ba5d23e1cf (patch) | |
| tree | dc44016b20723e38247300b6c6eaec3cd4e98761 /lisp/erc | |
| parent | bf67e61f291a82a9e90a7918f5188714853f0094 (diff) | |
| download | emacs-f1a4e679f3b0696089b4fd73717307ba5d23e1cf.tar.gz | |
Various minor variable/hook cleanups.
* lisp/emacs-lisp/edebug.el (edebug-inhibit-emacs-lisp-mode-bindings):
Rename from gud-inhibit-global-bindings.
* lisp/emacs-lisp/eieio.el (eieio-pre-method-execution-hooks): Doc fix.
* lisp/erc/erc-dcc.el (erc-dcc-chat-filter-functions): Rename from
erc-dcc-chat-filter-hook, since this is an abnormal hook.
* lisp/nxml/nxml-glyph.el (nxml-glyph-set-functions): Rename abnormal
hook from nxml-glyph-set-hook.
* lisp/progmodes/cwarn.el (cwarn-mode): Remove redundant variable
declaration.
* lisp/progmodes/pascal.el (pascal-toggle-completions): Doc fix.
* lisp/textmodes/bibtex.el (bibtex-string-file-path, bibtex-file-path):
Convert to defcustom.
* lisp/url/url-handlers.el (url-handler-regexp):
* lisp/url/url-nfs.el (url-nfs-automounter-directory-spec):
* lisp/url/url-vars.el (url-load-hook): Convert to defcustom.
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/erc/erc-dcc.el | 15 |
2 files changed, 15 insertions, 5 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index d8cca31499d..fbc5baa6a79 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,8 @@ +2012-06-12 Chong Yidong <cyd@gnu.org> + + * erc-dcc.el (erc-dcc-chat-filter-functions): Rename from + erc-dcc-chat-filter-hook, since this is an abnormal hook. + 2012-06-08 Chong Yidong <cyd@gnu.org> * erc.el (erc-direct-msg-face, erc-header-line, erc-input-face) diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el index d1ef1a99548..66256ee270e 100644 --- a/lisp/erc/erc-dcc.el +++ b/lisp/erc/erc-dcc.el @@ -627,7 +627,7 @@ separated by a space." ;;;###autoload (defvar erc-ctcp-query-DCC-hook '(erc-ctcp-query-DCC) - "Hook variable for CTCP DCC queries") + "Hook variable for CTCP DCC queries.") (defvar erc-dcc-query-handler-alist '(("SEND" . erc-dcc-handle-ctcp-send) @@ -1099,8 +1099,13 @@ Possible values are: ask, auto, ignore." (pcomplete-here '("auto" "ask" "ignore"))) (defalias 'pcomplete/erc-mode/SREQ 'pcomplete/erc-mode/CREQ) -(defvar erc-dcc-chat-filter-hook '(erc-dcc-chat-parse-output) - "Hook to run after doing parsing (and possible insertion) of DCC messages.") +(defvar erc-dcc-chat-filter-functions '(erc-dcc-chat-parse-output) + "Abnormal hook run after parsing (and maybe inserting) a DCC message. +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") (defvar erc-dcc-chat-mode-map (let ((map (make-sparse-keymap))) @@ -1195,8 +1200,8 @@ other client." (set-buffer (process-buffer proc)) (setq erc-dcc-unprocessed-output (concat erc-dcc-unprocessed-output str)) - (run-hook-with-args 'erc-dcc-chat-filter-hook proc - erc-dcc-unprocessed-output)) + (run-hook-with-args 'erc-dcc-chat-filter-functions + proc erc-dcc-unprocessed-output)) (set-buffer orig-buffer)))) (defun erc-dcc-chat-parse-output (proc str) |