Merge from origin/emacs-24

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

diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index bbce300af40563157d8d8c77663d0e27ba701e50..b2c1ba883a4df24ad8b305c89b94198dd69485a6 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