* net/dbus.el: Remove `no-byte-compile' cookie.

(dbus-call-method, dbus-register-signal, dbus-debug)
(dbus-registered-functions-table): Declare them with
`declare-function' or `defvar', respectively.
(top): Don't assert any longer.  Require 'cl when compiling.
Apply `ignore-errors' but `dbus-ignore-errors'.

2 files changed, 19 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f31b26834e3..f2c662e03c7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-10  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/dbus.el: Remove `no-byte-compile' cookie.
+        (dbus-call-method, dbus-register-signal, dbus-debug)
+        (dbus-registered-functions-table): Declare them with
+        `declare-function' or `defvar', respectively.
+        (top): Don't assert any longer.  Require 'cl when compiling.
+        Apply `ignore-errors' but `dbus-ignore-errors'.
+
 2008-02-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * diff-mode.el (diff-add-change-log-entries-other-window): Use
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 4390f305b66..8c03d9b9e53 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -1,4 +1,3 @@
-;;; -*- no-byte-compile: t; -*-
 ;;; dbus.el --- Elisp bindings for D-Bus.
 
 ;; Copyright (C) 2007, 2008 Free Software Foundation, Inc.
@@ -33,8 +32,15 @@
 ;;; Code:
 
 ;; D-Bus support in the Emacs core can be disabled with configuration
-;; option "--without-dbus".  Check it.
-(assert (featurep 'dbusbind) nil "D-Bus is not supported")
+;; option "--without-dbus".  Declare used subroutines and variables.
+(declare-function dbus-call-method "dbusbind.c")
+(declare-function dbus-register-signal "dbusbind.c")
+(defvar dbus-debug)
+(defvar dbus-registered-functions-table)
+
+;; Pacify byte compiler.
+(eval-when-compile
+  (require 'cl))
 
 (require 'xml)
 
@@ -158,7 +164,7 @@ usage: (dbus-name-owner-changed-handler service old-owner new-owner)"
           args))))))
 
 ;; Register the handler.
-(dbus-ignore-errors
+(ignore-errors
   (dbus-register-signal
    :system dbus-service-dbus dbus-path-dbus dbus-interface-dbus
    "NameOwnerChanged" 'dbus-name-owner-changed-handler)