* riece-addon.el (riece-command-insinuate-addon)

(riece-command-uninstall-addon, riece-command-unload-addon): Fix
"Wrong type argument" error on not riece-addon-list-mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 081036c..2d21b49 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-28  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * riece-addon.el (riece-command-insinuate-addon)
+       (riece-command-uninstall-addon, riece-command-unload-addon): Fix
+       "Wrong type argument" error on not riece-addon-list-mode.
+
 2009-07-26  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * riece-skk-kakutei.el: Fix Author header.

diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el
index 1402af9..61e30f9 100644 (file)
--- a/lisp/riece-addon.el
+++ b/lisp/riece-addon.el
@@ -461,7 +461,8 @@ Useful keys:
                                    (list (symbol-name (car dependency))))
                                  riece-addon-modules)
                          (lambda (pointer)
-                           (not (get (car pointer) 'riece-addon-insinuated)))
+                           (not (get (intern-soft (car pointer))
+                                     'riece-addon-insinuated)))
                          t)))))
   (riece-insinuate-addon addon 'ask)
   (when (eq major-mode 'riece-addon-list-mode)
@@ -479,7 +480,8 @@ Useful keys:
                                    (list (symbol-name (car dependency))))
                                  riece-addon-dependencies)
                          (lambda (pointer)
-                           (get (car pointer) 'riece-addon-insinuated))
+                           (get (intern-soft (car pointer))
+                                'riece-addon-insinuated))
                          t)))))
   (riece-uninstall-addon addon t)
   (when (eq major-mode 'riece-addon-list-mode)
@@ -497,7 +499,8 @@ Useful keys:
                                    (list (symbol-name (car dependency))))
                                  riece-addon-dependencies)
                          (lambda (pointer)
-                           (get (car pointer) 'riece-addon-insinuated))
+                           (get (intern-soft (car pointer))
+                                'riece-addon-insinuated))
                          t)))))
   (riece-uninstall-addon addon t)
   (if (get addon 'riece-addon-not-unloadable)