aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorDaiki Ueno2015-02-26 11:01:10 +0900
committerDaiki Ueno2015-02-26 11:08:44 +0900
commitb206b9d73728dec9b71a41ac4e1622ec795d6fd0 (patch)
tree52237905ceb80abd9a6e5fb36ad33416031aba86 /lisp
parent719fd9334634dfc91e145d0a7320387a8bb4b75f (diff)
downloademacs-b206b9d73728dec9b71a41ac4e1622ec795d6fd0.tar.gz
emacs-b206b9d73728dec9b71a41ac4e1622ec795d6fd0.zip
dbus.el: fix ":argN" keyword recognition
* net/dbus.el (dbus-register-signal): Convert "N" of ":argN" to integer before comparison.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/dbus.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7f7eac64b6e..33e04807e87 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12015-02-26 Daiki Ueno <ueno@gnu.org>
2
3 * net/dbus.el (dbus-register-signal): Convert "N" of ":argN" to
4 integer before comparison.
5
12015-02-25 Nicolas Richard <theonewiththeevillook@yahoo.fr> 62015-02-25 Nicolas Richard <theonewiththeevillook@yahoo.fr>
2 7
3 * progmodes/elisp-mode.el (elisp--eval-last-sexp): Document argument. 8 * progmodes/elisp-mode.el (elisp--eval-last-sexp): Document argument.
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index bbce300af40..b2c1ba883a4 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -707,7 +707,8 @@ Example:
707 (setq counter (match-string 2 (symbol-name key)) 707 (setq counter (match-string 2 (symbol-name key))
708 args (cdr args) 708 args (cdr args)
709 value (car args)) 709 value (car args))
710 (unless (and (<= counter 63) (stringp value)) 710 (unless (and (<= (string-to-number counter) 63)
711 (stringp value))
711 (signal 'wrong-type-argument 712 (signal 'wrong-type-argument
712 (list "Wrong argument" key value))) 713 (list "Wrong argument" key value)))
713 (format 714 (format