[Emacs-diffs] Changes to emacs/lisp/net/dbus.el,v

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       08/02/10 20:44:27

Index: dbus.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/dbus.el,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- dbus.el     6 Feb 2008 20:54:19 -0000       1.14
+++ dbus.el     10 Feb 2008 20:44:27 -0000      1.15
@@ -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 @@
          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)