* riece-addon.el (riece-insinuate-addon): Add optional 2nd

[riece] / lisp / riece-addon.el

diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el
index 33b9bb4..a455516 100644 (file)
--- a/lisp/riece-addon.el
+++ b/lisp/riece-addon.el
@@ -92,35 +92,35 @@
        (error "Circular add-on dependency found"))
     (nreverse addons)))
 
-(defun riece-insinuate-addon (addon)
+(defun riece-insinuate-addon (addon &optional verbose)
   (require addon)              ;implicit dependency
   (funcall (intern (concat (symbol-name addon) "-insinuate")))
-  (if riece-debug
+  (if verbose
       (message "Add-on %S is insinuated" addon)))
 
-(defun riece-enable-addon (addon)
+(defun riece-enable-addon (addon &optional verbose)
   (let ((enabled (intern-soft (concat (symbol-name addon) "-enabled"))))
     (if (null enabled)
-       (if riece-debug
+       (if verbose
            (message "Add-on %S doesn't support enable/disable" addon))
       (if (symbol-value enabled)
-         (if riece-debug
+         (if verbose
              (message "Can't enable add-on %S" addon))
        (funcall (intern (concat (symbol-name addon) "-enable")))
-       (if riece-debug
+       (if verbose
            (message "Add-on %S enabled" addon))))))
 
-(defun riece-disable-addon (addon)
+(defun riece-disable-addon (addon &optional verbose)
   (let ((enabled (intern-soft (concat (symbol-name addon) "-enabled"))))
     (if (null enabled)
-       (if riece-debug
+       (if verbose
            (message "Add-on %S doesn't support enable/disable" addon))
       (if (symbol-value enabled)
          (progn
            (funcall (intern (concat (symbol-name addon) "-disable")))
-           (if riece-debug
+           (if verbose
                (message "Add-on %S disabled" addon)))
-       (if riece-debug
+       (if verbose
            (message "Can't disable add-on %S" addon))))))
 
 (defun riece-addon-list-mode ()
@@ -165,7 +165,7 @@ All normal editing commands are turned off."
                        (car pointer)
                        (if description
                            (symbol-value description)
-                         "no description")))
+                         "(no description)")))
        (put-text-property point (point) 'riece-addon (car pointer))
        (setq pointer (cdr pointer)))
       (insert "
@@ -175,7 +175,13 @@ Symbols in the leftmost column:
   -     The add-on is disabled.
   =    The add-on doesn't support enable/disable operation.
   ?    The add-on status is not known.
-"))
+")
+      (insert (substitute-command-keys "
+Useful keys:
+
+  `\\[riece-command-enable-addon]' to enable the current add-on.
+  `\\[riece-command-disable-addon]' to disable the current add-on.
+")))
     (pop-to-buffer (current-buffer))))
 
 (defun riece-command-enable-addon (addon)
@@ -191,7 +197,7 @@ Symbols in the leftmost column:
                           (and enabled
                                (null (symbol-value enabled))))
                         t))))
-  (riece-enable-addon addon)
+  (riece-enable-addon addon t)
   (riece-command-list-addons))
 
 (defun riece-command-disable-addon (addon)
@@ -207,7 +213,7 @@ Symbols in the leftmost column:
                           (and enabled
                                (symbol-value enabled)))
                         t))))
-  (riece-disable-addon addon)
+  (riece-disable-addon addon t)
   (riece-command-list-addons))
       
 (provide 'riece-addon)