diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-10-23 11:06:07 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-10-23 11:06:07 -0400 |
| commit | d106953274d29b6be4ef7e2c442078c81a52ff2f (patch) | |
| tree | 1daf5ea3f0c8d0ed1914ba3fc339b1dd23438e20 /lisp/net/dbus.el | |
| parent | f7eac6d887b7768034e40f16dacbb0c8fb569417 (diff) | |
| download | emacs-d106953274d29b6be4ef7e2c442078c81a52ff2f.tar.gz emacs-d106953274d29b6be4ef7e2c442078c81a52ff2f.tar.bz2 emacs-d106953274d29b6be4ef7e2c442078c81a52ff2f.zip | |
Cleanup uses of "-hooks".
* doc/emacs/custom.texi (Hooks):
* doc/lispref/hooks.texi (Standard Hooks): Clarify that -hooks is deprecated.
* lisp/gnus/nndiary.el (nndiary-request-create-group-functions)
(nndiary-request-update-info-functions)
(nndiary-request-accept-article-functions):
* lisp/gnus/gnus-start.el (gnus-subscribe-newsgroup-functions):
* lisp/cedet/semantic/db-file.el (semanticdb-save-database-functions):
* lisp/cedet/semantic/lex.el (semantic-lex-reset-functions):
* lisp/cedet/semantic/edit.el (semantic-change-functions)
(semantic-edits-new-change-functions)
(semantic-edits-delete-change-functions)
(semantic-edits-reparse-change-functions):
* lisp/htmlfontify.el (hfy-post-html-hook):
* lisp/filesets.el (filesets-cache-fill-content-hook):
* lisp/arc-mode.el (archive-extract-hook):
* lisp/progmodes/cc-mode.el (c-prepare-bug-report-hook):
* lisp/net/rcirc.el (rcirc-sentinel-functions)
(rcirc-receive-message-functions, rcirc-activity-functions)
(rcirc-print-functions):
* lisp/net/dbus.el (dbus-event-error-functions):
* lisp/emacs-lisp/eieio.el (eieio-pre-method-execution-functions):
* lisp/emacs-lisp/checkdoc.el (checkdoc-style-functions)
(checkdoc-comment-style-functions): Don't use "-hooks" suffix.
* lisp/term/sun.el (sun-raw-prefix-hooks):
* lisp/mail/sendmail.el (mail-yank-hooks):
* lisp/mh-e/mh-letter.el (mh-yank-hooks): Use make-obsolete-variable.
Diffstat (limited to 'lisp/net/dbus.el')
| -rw-r--r-- | lisp/net/dbus.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index 772a0a9c626..c95e901c39d 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -152,7 +152,9 @@ Otherwise, return result of last form in BODY, or all other errors." (dbus-error (when dbus-debug (signal (car err) (cdr err)))))) (font-lock-add-keywords 'emacs-lisp-mode '("\\<dbus-ignore-errors\\>")) -(defvar dbus-event-error-hooks nil +(define-obsolete-variable-alias 'dbus-event-error-hooks + 'dbus-event-error-functions "24.3") +(defvar dbus-event-error-functions nil "Functions to be called when a D-Bus error happens in the event handler. Every function must accept two arguments, the event and the error variable caught in `condition-case' by `dbus-error'.") @@ -947,7 +949,7 @@ If the HANDLER returns a `dbus-error', it is propagated as return message." (dbus-method-error-internal (nth 1 event) (nth 4 event) (nth 3 event) (cadr err)))) ;; Propagate D-Bus error messages. - (run-hook-with-args 'dbus-event-error-hooks event err) + (run-hook-with-args 'dbus-event-error-functions event err) (when (or dbus-debug (= dbus-message-type-error (nth 2 event))) (signal (car err) (cdr err)))))) |