X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-addon.el;h=a773032a55b086f3fe9cef1865e617cea8c645c4;hb=27c68d441126f7e1bd6d54529ec7c3684c67b9a0;hp=766c7b544a66d03c55f4b96f26b2ac051bd09873;hpb=26067c8bc103b0afc65fa5359127186c1be1fa84;p=riece

diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el
index 766c7b5..a773032 100644
--- a/lisp/riece-addon.el
+++ b/lisp/riece-addon.el
@@ -55,7 +55,7 @@
   '((((class color) (background dark))
      (:foreground "PaleTurquoise" :italic t))
     (t
-     (:italic t)))
+     ()))
   "Face used for displaying the disabled addon."
   :group 'riece-addon-list-faces)
 (defvar riece-addon-list-disabled-face 'riece-addon-list-disabled-face)
@@ -71,7 +71,7 @@
 
 (defface riece-addon-list-uninstalled-face
   '((t
-     (:foreground "red")))
+     (:italic t)))
   "Face used for displaying the uninstalled addon."
   :group 'riece-addon-list-faces)
 (defvar riece-addon-list-uninstalled-face 'riece-addon-list-uninstalled-face)
@@ -207,7 +207,9 @@
     (funcall (intern (concat (symbol-name addon) "-insinuate")))
     (put addon 'riece-addon-insinuated t)
     (if verbose
-	(message "Add-on %S is insinuated" addon))))
+	(message "Add-on %S is insinuated" addon))
+    (unless (get addon 'riece-addon-default-disabled)
+      (riece-enable-addon addon t))))
 
 (defun riece-uninstall-addon (addon &optional verbose)
   (if (not (get addon 'riece-addon-insinuated))
@@ -229,8 +231,10 @@
 			 #'ignore))
 	    (setq riece-addon-dependencies
 		  (delq entry riece-addon-dependencies))
-	    (put addon 'riece-addon-insinuated nil)
-	    (setq riece-addons (delq addon riece-addons))))
+	    (remprop addon 'riece-addon-insinuated)
+	    (setq riece-addons (delq addon riece-addons)
+		  riece-addon-dependencies (riece-resolve-addons
+					    (copy-sequence riece-addons)))))
       (if verbose
 	  (message "Add-on %S is uninstalled" addon)))))