aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/net
diff options
context:
space:
mode:
authorStefan Monnier2010-08-30 15:03:05 +0200
committerStefan Monnier2010-08-30 15:03:05 +0200
commitf291fe60fb9ed250ded34b6b9ed26e085f119a4e (patch)
treeb46060fd239d808d5873eb871ea4ccad8de9497b /lisp/net
parentcd196f125640597cb91f3f66ae2608c6923044fa (diff)
downloademacs-f291fe60fb9ed250ded34b6b9ed26e085f119a4e.tar.gz
emacs-f291fe60fb9ed250ded34b6b9ed26e085f119a4e.zip
Use `declare' in defmacros.
* lisp/window.el (save-selected-window): * lisp/subr.el (with-temp-file, with-temp-message, with-syntax-table): * lisp/progmodes/python.el (def-python-skeleton): * lisp/net/dbus.el (dbus-ignore-errors): * lisp/jka-cmpr-hook.el (with-auto-compression-mode): * lisp/international/mule.el (with-category-table): * lisp/emacs-lisp/timer.el (with-timeout): * lisp/emacs-lisp/lisp-mnt.el (lm-with-file): * lisp/emacs-lisp/eieio.el (with-slots): * lisp/emacs-lisp/easymenu.el (easy-menu-define): * lisp/emacs-lisp/debug.el (debugger-env-macro): * lisp/emacs-lisp/cl-compat.el (Multiple-value-bind, Multiple-value-setq) (Multiple-value-call, Multiple-value-prog1): * lisp/emacs-lisp/cl-seq.el (cl-parsing-keywords, cl-check-key) (cl-check-test-nokey, cl-check-test, cl-check-match): Move indent and edebug rule to definition. * lisp/emacs-lisp/lisp-mode.el (save-selected-window) (with-current-buffer, combine-after-change-calls) (with-output-to-string, with-temp-file, with-temp-buffer) (with-temp-message, with-syntax-table, read-if, eval-after-load) (dolist, dotimes, when, unless): * lisp/emacs-lisp/byte-run.el (inline): Remove indent rule, redundant.
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/dbus.el4
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index ee876e04190..8d9512d6f9f 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -92,12 +92,10 @@
92(defmacro dbus-ignore-errors (&rest body) 92(defmacro dbus-ignore-errors (&rest body)
93 "Execute BODY; signal D-Bus error when `dbus-debug' is non-nil. 93 "Execute BODY; signal D-Bus error when `dbus-debug' is non-nil.
94Otherwise, return result of last form in BODY, or all other errors." 94Otherwise, return result of last form in BODY, or all other errors."
95 (declare (indent 0) (debug t))
95 `(condition-case err 96 `(condition-case err
96 (progn ,@body) 97 (progn ,@body)
97 (dbus-error (when dbus-debug (signal (car err) (cdr err)))))) 98 (dbus-error (when dbus-debug (signal (car err) (cdr err))))))
98
99(put 'dbus-ignore-errors 'lisp-indent-function 0)
100(put 'dbus-ignore-errors 'edebug-form-spec '(form body))
101(font-lock-add-keywords 'emacs-lisp-mode '("\\<dbus-ignore-errors\\>")) 99(font-lock-add-keywords 'emacs-lisp-mode '("\\<dbus-ignore-errors\\>"))
102 100
103(defvar dbus-event-error-hooks nil 101(defvar dbus-event-error-hooks nil