Merge from trunk.

3 files changed, 48 insertions, 18 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 662dd7a7f99..92324036dc5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2011-09-25  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/dbus.el (dbus-unregister-object): Don't release services for
+        registered signals.  (Bug#9581)
+
+2011-09-25  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * progmodes/cfengine.el (cfengine-auto-mode): Add convenience
+        function that picks between cfengine 2 and 3 support
+        automatically.  Update docs accordingly.
+
 2011-09-22  Ken Manheimer  <ken.manheimer@gmail.com>
 
         * allout.el (allout-this-command-hid-stuff): Buffer-local variable
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index cbf9fe6ed86..ba7d7115ffc 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -140,11 +140,14 @@ association to the service from D-Bus."
 
   ;; Find the corresponding entry in the hash table.
   (let* ((key (car object))
-         (value (cdr object))
+         (value (cadr object))
+         (bus (car key))
+         (service (car value))
          (entry (gethash key dbus-registered-objects-table))
          ret)
+    ;; key has the structure (BUS INTERRFACE MEMBER).
+    ;; value has the structure (SERVICE PATH [HANDLER]).
     ;; entry has the structure ((UNAME SERVICE PATH MEMBER [RULE]) ...).
-    ;; value has the structure ((SERVICE PATH [HANDLER]) ...).
     ;; MEMBER is either a string (the handler), or a cons cell (a
     ;; property value).  UNAME and property values are not taken into
     ;; account for comparision.
@@ -152,8 +155,8 @@ association to the service from D-Bus."
     ;; Loop over the registered functions.
     (dolist (elt entry)
       (when (equal
-             (car value)
-             (butlast (cdr elt) (- (length (cdr elt)) (length (car value)))))
+             value
+             (butlast (cdr elt) (- (length (cdr elt)) (length value))))
         (setq ret t)
         ;; Compute new hash value.  If it is empty, remove it from the
         ;; hash table.
@@ -162,17 +165,16 @@ association to the service from D-Bus."
         ;; Remove match rule of signals.
         (let ((rule (nth 4 elt)))
           (when (stringp rule)
+            (setq service nil) ; We do not need to unregister the service.
             (dbus-call-method
-             (car key) dbus-service-dbus dbus-path-dbus dbus-interface-dbus
+             bus dbus-service-dbus dbus-path-dbus dbus-interface-dbus
              "RemoveMatch" rule)))))
     ;; Check, whether there is still a registered function or property
     ;; for the given service.  If not, unregister the service from the
     ;; bus.
-    (dolist (elt entry)
-      (let ((service (cadr elt))
-            (bus (car key))
-            found)
-        (when service
+    (when service
+      (dolist (elt entry)
+        (let (found)
           (maphash
            (lambda (k v)
              (dolist (e v)
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index 7989c60f80c..eea822328f1 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -26,16 +26,21 @@
 ;; Provides support for editing GNU Cfengine files, including
 ;; font-locking, Imenu and indention, but with no special keybindings.
 
-;; Possible customization for auto-mode selection:
-;; (push '(("^cfagent.conf\\'" . cfengine-mode)) auto-mode-alist)
-;; (push '(("^cf\\." . cfengine-mode)) auto-mode-alist)
-;; (push '(("\\.cf\\'" . cfengine-mode)) auto-mode-alist)
+;; The CFEngine 3.x support doesn't have Imenu support but patches are
+;; welcome.
 
-;; Or, if you want to use the CFEngine 3.x support:
+;; You can set it up so either cfengine-mode (2.x and earlier) or
+;; cfengine3-mode (3.x) will be picked, depending on the buffer
+;; contents:
 
-;; (push '(("^cfagent.conf\\'" . cfengine3-mode)) auto-mode-alist)
-;; (push '(("^cf\\." . cfengine3-mode)) auto-mode-alist)
-;; (push '(("\\.cf\\'" . cfengine3-mode)) auto-mode-alist)
+;; (add-to-list 'auto-mode-alist '("\\.cf\\'" . cfengine-auto-mode))
+
+;; OR you can choose to always use a specific version, if you prefer
+;; it
+
+;; (add-to-list 'auto-mode-alist '("\\.cf\\'" . cfengine3-mode))
+;; (add-to-list 'auto-mode-alist '("^cf\\." . cfengine-mode))
+;; (add-to-list 'auto-mode-alist '("^cfagent.conf\\'" . cfengine-mode))
 
 ;; This is not the same as the mode written by Rolf Ebert
 ;; <ebert@waporo.muc.de>, distributed with cfengine-2.0.5.  It does
@@ -466,6 +471,18 @@ to the action header."
        #'cfengine-beginning-of-defun)
   (set (make-local-variable 'end-of-defun-function) #'cfengine-end-of-defun))
 
+;;;###autoload
+(defun cfengine-auto-mode ()
+  "Choose between `cfengine-mode' and `cfengine3-mode' depending
+on the buffer contents"
+  (let ((v3 nil))
+    (save-restriction
+      (goto-char (point-min))
+      (while (not (or (eobp) v3))
+        (setq v3 (looking-at (concat cfengine3-defuns-regex "\\>")))
+        (forward-line)))
+    (if v3 (cfengine3-mode) (cfengine-mode))))
+
 (provide 'cfengine3)
 (provide 'cfengine)