* riece-addon.el (riece-command-list-addons): Adjust width of 2nd

[riece] / lisp / riece-addon.el

diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el
index bbced80..154ad2e 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
@@ -321,7 +321,7 @@ All normal editing commands are turned off."
        buffer-read-only
        (pointer riece-addon-dependencies)
        module-description-alist
-       description point)
+       description point longest)
     (while pointer
       (setq description (intern-soft (concat (symbol-name (car (car pointer)))
                                             "-description"))
@@ -342,13 +342,20 @@ All normal editing commands are turned off."
       (setq pointer (cdr pointer)))
     (erase-buffer)
     (riece-kill-all-overlays)
+    (setq pointer module-description-alist
+         longest "")
+    (while pointer
+      (if (> (length (symbol-name (car (car pointer))))
+            (length longest))
+         (setq longest (symbol-name (car (car pointer)))))
+      (setq pointer (cdr pointer)))
     (setq pointer (sort module-description-alist
                        (lambda (entry1 entry2)
                          (string-lessp (symbol-name (car entry1))
                                        (symbol-name (car entry2))))))
     (while pointer
       (setq point (point))
-      (insert (format "%c %-15S %s\n"
+      (insert (format (format "%%c %%-%dS %%s\n" (length longest))
                      (if (not (featurep (car (car pointer))))
                          ? 
                        (if (not (get (car (car pointer))