diff options
| author | Michael Albinus | 2008-01-21 20:01:19 +0000 |
|---|---|---|
| committer | Michael Albinus | 2008-01-21 20:01:19 +0000 |
| commit | d2e4a6c90428e7bce7ee7d71e2cc5b2ee0ee40d9 (patch) | |
| tree | a3f7dfa60de8182a9db2277a677abe7438792a35 /doc/misc | |
| parent | d405bc15fc6e676f2c6af2afd06cf7c730f0f82d (diff) | |
| download | emacs-d2e4a6c90428e7bce7ee7d71e2cc5b2ee0ee40d9.tar.gz emacs-d2e4a6c90428e7bce7ee7d71e2cc5b2ee0ee40d9.zip | |
* dbus.texi (Errors and Events): New macro dbus-ignore-errors.
Diffstat (limited to 'doc/misc')
| -rw-r--r-- | doc/misc/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/misc/dbus.texi | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index a69f32a976e..47e521f537c 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-01-21 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * dbus.texi (Errors and Events): New macro dbus-ignore-errors. | ||
| 4 | |||
| 1 | 2008-01-18 Katsumi Yamaoka <yamaoka@jpl.org> | 5 | 2008-01-18 Katsumi Yamaoka <yamaoka@jpl.org> |
| 2 | 6 | ||
| 3 | * gnus-news.texi: Mention gnus-article-describe-bindings. | 7 | * gnus-news.texi: Mention gnus-article-describe-bindings. |
diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi index 506716e8d92..27550337b39 100644 --- a/doc/misc/dbus.texi +++ b/doc/misc/dbus.texi | |||
| @@ -674,9 +674,15 @@ there is a type mismatch, the Lisp error @code{wrong-type-argument} | |||
| 674 | @code{D-Bus ARG} is raised. | 674 | @code{D-Bus ARG} is raised. |
| 675 | 675 | ||
| 676 | All errors raised by D-Bus are signaled with the error symbol | 676 | All errors raised by D-Bus are signaled with the error symbol |
| 677 | @code{dbus-error}. As usual, such an error can be trapped with a | 677 | @code{dbus-error}. If possible, error messages from D-Bus are |
| 678 | @code{condition-case} form. If possible, error messages from D-Bus | 678 | appended to the @code{dbus-error}. |
| 679 | are appended to the @code{dbus-error}. | 679 | |
| 680 | @defspec dbus-ignore-errors forms@dots{} | ||
| 681 | This executes @var{forms} exactly like a @code{progn}, except that | ||
| 682 | @code{dbus-error} errors are ignored during the @var{forms}. These | ||
| 683 | errors can be made visible when variable @code{dbus-debug} is set to | ||
| 684 | @code{t}. | ||
| 685 | @end defspec | ||
| 680 | 686 | ||
| 681 | Incoming D-Bus messages are handled as Emacs events (see @pxref{Misc | 687 | Incoming D-Bus messages are handled as Emacs events (see @pxref{Misc |
| 682 | Events, , , elisp}). The generated event has this form: | 688 | Events, , , elisp}). The generated event has this form: |