Merge from origin/emacs-24

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

diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 582f54faf4e91c17f0ee6e857553ff692776b2da..b2c1ba883a4df24ad8b305c89b94198dd69485a6 100644 (file)
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -1,6 +1,6 @@
 ;;; dbus.el --- Elisp bindings for D-Bus.
 
-;; Copyright (C) 2007-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2015 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, hardware
@@ -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