Fixed.

diff --git a/doc/HACKING b/doc/HACKING
index b3c3e01..882d835 100644 (file)
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -400,7 +400,7 @@ It is recommended to set short explanation of the add-on to
 <module-name>-description variable which is displayed on add-on
 listing shown up by C-c ^ (M-x riece-command-list-addons).
 
-To see the add-on's enabled/disabled status, look at riece-addon-enabled
+To see the add-on's enabled/disabled status, check riece-addon-enabled
 property set on <module-name> symbol.
 
 Riece does the following procedure on add-ons when startup.

diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el
index bbced80..f91cc1d 100644 (file)
--- a/lisp/riece-addon.el
+++ b/lisp/riece-addon.el
@@ -270,8 +270,8 @@
       (if verbose
          (message "Add-on %S is already enabled" addon))
     (let ((enable (intern-soft (concat (symbol-name addon) "-enable"))))
-      (if (or (null enable)
-             (not (fboundp enable)))
+      (if (and enable
+              (fboundp enable))
          (funcall enable))
       (put addon 'riece-addon-enabled t)
       (if verbose
@@ -284,8 +284,8 @@
       (if verbose
          (message "Add-on %S is already disabled" addon))
     (let ((disable (intern-soft (concat (symbol-name addon) "-disable"))))
-      (if (or (null disable)
-             (not (fboundp disable)))
+      (if (and disable
+              (fboundp disable))
          (funcall disable))
       (put addon 'riece-addon-enabled nil)
       (if verbose