Rationalize use of c[ad]+r, expunging cl-c[ad]\{3,4\}r.

[gnu-emacs] / lisp / net / dbus.el

diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index bbce300af40563157d8d8c77663d0e27ba701e50..4f63374a9b62fc9ac519a1b5569075bebbfdc02b 100644 (file)
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -707,7 +707,8 @@ Example:
                 (setq counter (match-string 2 (symbol-name key))
                       args (cdr args)
                       value (car args))
-                (unless (and (<= counter 63) (stringp value))
+                (unless (and (<= (string-to-number counter) 63)
+                             (stringp value))
                   (signal 'wrong-type-argument
                           (list "Wrong argument" key value)))
                 (format
@@ -868,7 +869,7 @@ association to the service from D-Bus."
                                ;; Service.
                                (string-equal service (cadr e))
                                ;; Non-empty object path.
-                               (cl-caddr e)
+                               (caddr e)
                                (throw :found t)))))
                         dbus-registered-objects-table)
                        nil))))
@@ -1473,7 +1474,7 @@ name of the property, and its value.  If there are no properties,
                bus service path dbus-interface-properties
                "GetAll" :timeout 500 interface)
               result)
-       (add-to-list 'result (cons (car dict) (cl-caadr dict)) 'append)))))
+       (add-to-list 'result (cons (car dict) (caadr dict)) 'append)))))
 
 (defun dbus-register-property
   (bus service path interface property access value
@@ -1671,7 +1672,7 @@ and \"org.freedesktop.DBus.Properties.GetAll\", which is slow."
                (if (cadr entry2)
                    ;; "sv".
                    (dolist (entry3 (cadr entry2))
-                     (setcdr entry3 (cl-caadr entry3)))
+                     (setcdr entry3 (caadr entry3)))
                  (setcdr entry2 nil)))))
 
        ;; Fallback: collect the information.  Slooow!