Changed add-on mark ?? -> ? .

[elisp/riece.git] / lisp / riece-addon.el

diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el
index 68a99b9..ecf476d 100644 (file)
--- a/lisp/riece-addon.el
+++ b/lisp/riece-addon.el
@@ -28,6 +28,7 @@
 (require 'riece-options)
 (require 'riece-compat)
 (require 'riece-misc)
+(require 'riece-addon-modules)
 
 (defgroup riece-addon-list nil
   "Add-on listing."
@@ -68,12 +69,12 @@
   :group 'riece-addon-list-faces)
 (defvar riece-addon-list-unsupported-face 'riece-addon-list-unsupported-face)
 
-(defface riece-addon-list-unknown-face
+(defface riece-addon-list-uninstalled-face
   '((t
      (:foreground "red")))
-  "Face used for displaying the unknown addon."
+  "Face used for displaying the uninstalled addon."
   :group 'riece-addon-list-faces)
-(defvar riece-addon-list-unknown-face 'riece-addon-list-unknown-face)
+(defvar riece-addon-list-uninstalled-face 'riece-addon-list-uninstalled-face)
 
 (defface riece-addon-list-description-face
   '((((class color)
@@ -92,13 +93,13 @@
   '((?+ . riece-addon-list-enabled-face)
     (?- . riece-addon-list-disabled-face)
     (?! . riece-addon-list-unsupported-face)
-    (?? . riece-addon-list-unknown-face))
+    (?  . riece-addon-list-uninstalled-face))
   "An alist mapping marks on riece-addon-list-buffer to faces."
   :type 'list
   :group 'riece-addon-list)
 
 (defcustom riece-addon-list-font-lock-keywords
-  '(("^\\([-+!?] [^:]+\\): \\(.*\\)"
+  '(("^\\([-+! ] [^:]+\\): \\(.*\\)"
      (1 (cdr (assq (aref (match-string 1) 0)
                   riece-addon-list-mark-face-alist)))
      (2 riece-addon-list-description-face)))
@@ -279,31 +280,48 @@ All normal editing commands are turned off."
   (riece-addon-list-mode)
   (let ((inhibit-read-only t)
        buffer-read-only
-       (pointer (sort (copy-sequence riece-addon-dependencies)
-                      (lambda (dependency1 dependency2)
-                        (string-lessp (symbol-name (car dependency1))
-                                      (symbol-name (car dependency2))))))
-       enabled description point)
+       (pointer riece-addon-dependencies)
+       module-description-alist
+       description enabled point)
+    (while pointer
+      
+      (setq description (intern-soft (concat (symbol-name (car (car pointer)))
+                                            "-description"))
+           module-description-alist
+           (cons (cons (car (car pointer))
+                       (if description
+                           (symbol-value description)
+                         "(no description)"))
+                 module-description-alist)
+           pointer (cdr pointer)))
+    (setq pointer riece-addon-modules)
+    (while pointer
+      (unless (assq (car (car pointer))
+                   module-description-alist)
+       (setq module-description-alist
+             (cons (car pointer) module-description-alist)))
+      (setq pointer (cdr pointer)))
     (erase-buffer)
     (riece-kill-all-overlays)
+    (setq pointer (sort module-description-alist
+                       (lambda (entry1 entry2)
+                         (string-lessp (symbol-name (car entry1))
+                                       (symbol-name (car entry2))))))
     (while pointer
       (setq enabled (intern-soft (concat (symbol-name (car (car pointer)))
-                                        "-enabled"))
-           description (intern-soft (concat (symbol-name (car (car pointer)))
-                                            "-description")))
+                                        "-enabled")))
       (setq point (point))
       (insert (format "%c %S: %s\n"
-                     (if (not (featurep (car (car pointer))))
-                         ??
+                     (if (not (get (car (car pointer))
+                                   'riece-addon-insinuated))
+                         ? 
                        (if (null enabled)
                            ?!
                          (if (symbol-value enabled)
                              ?+
                            ?-)))
                      (car (car pointer))
-                     (if description
-                         (symbol-value description)
-                       "(no description)")))
+                     (cdr (car pointer))))
       (put-text-property point (point) 'riece-addon (car (car pointer)))
       (setq pointer (cdr pointer)))
     (insert "
@@ -312,7 +330,7 @@ Symbols in the leftmost column:
   +     The add-on is enabled.
   -     The add-on is disabled.
   !    The add-on doesn't support enable/disable operation.
-  ?    The add-on status is unknown.
+       The add-on is not insinuated.
 ")
     (insert (substitute-command-keys "
 Useful keys: