:group 'riece-addon-list-faces)
(defvar riece-addon-list-uninstalled-face 'riece-addon-list-uninstalled-face)
+(defface riece-addon-list-unloaded-face
+ '((t
+ (:italic t :inverse-video t)))
+ "Face used for displaying the unloaded addon."
+ :group 'riece-addon-list-faces)
+(defvar riece-addon-list-unloaded-face 'riece-addon-list-unloaded-face)
+
(defface riece-addon-list-description-face
'((((class color)
(background dark))
'((?+ . riece-addon-list-enabled-face)
(?- . riece-addon-list-disabled-face)
(?! . riece-addon-list-unsupported-face)
- (? . riece-addon-list-uninstalled-face))
+ (?? . riece-addon-list-uninstalled-face)
+ (? . riece-addon-list-unloaded-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
- '(("^\\([-+! ] [^:]+\\): \\(.*\\)"
+ '(("^\\([-+!? ] \\S-+\\)\\s-+\\(.*\\)"
(1 (cdr (assq (aref (match-string 1) 0)
riece-addon-list-mark-face-alist)))
(2 riece-addon-list-description-face)))
(let ((keymap (make-sparse-keymap)))
(define-key keymap "+" 'riece-command-enable-addon)
(define-key keymap "-" 'riece-command-disable-addon)
- (define-key keymap "I" 'riece-command-insinuate-addon)
- (define-key keymap "D" 'riece-command-uninstall-addon)
+ (define-key keymap "i" 'riece-command-insinuate-addon)
+ (define-key keymap "u" 'riece-command-uninstall-addon)
+ (define-key keymap "U" 'riece-command-unload-addon)
(define-key keymap "n" 'next-line)
(define-key keymap "p" 'previous-line)
(define-key keymap " " 'scroll-up)
dependencies)
(while addons
(require (car addons)) ;error will be reported here
- (let* ((requires
- (funcall (or (intern-soft
- (concat (symbol-name (car addons)) "-requires"))
- #'ignore)))
+ (let* ((requires-function
+ (intern-soft
+ (concat (symbol-name (car addons)) "-requires")))
+ (requires
+ (if (and requires-function
+ (fboundp requires-function))
+ (funcall requires-function)))
(pointer requires)
entry)
;; Increment succs' pred count.
(riece-sort-addon-dependencies
(riece-load-and-build-addon-dependencies addons)))
-(defun riece-insinuate-addon (addon &optional verbose)
- (unless (assq addon riece-addon-dependencies)
- (setq riece-addons (cons addon riece-addons)
- riece-addon-dependencies (riece-resolve-addons
- (copy-sequence riece-addons))))
+(defun riece-insinuate-addon-1 (addon verbose)
(if (get addon 'riece-addon-insinuated)
(if verbose
(message "Add-on %S is already insinuated" addon))
+ (require addon)
(funcall (intern (concat (symbol-name addon) "-insinuate")))
(put addon 'riece-addon-insinuated t)
(if verbose
(unless (get addon 'riece-addon-default-disabled)
(riece-enable-addon addon t))))
+(defun riece-insinuate-addon (addon &optional verbose)
+ (unless (assq addon riece-addon-dependencies)
+ (setq riece-addons (cons addon riece-addons)
+ riece-save-variables-are-dirty t
+ riece-addon-dependencies
+ (riece-resolve-addons
+ (cons addon (mapcar #'car riece-addon-dependencies)))))
+ (let ((pointer riece-addon-dependencies))
+ (while pointer
+ (unless (get (car (car pointer)) 'riece-addon-insinuated)
+ (riece-insinuate-addon-1 (car (car pointer)) verbose))
+ (if (eq (car (car pointer)) addon)
+ (setq pointer nil)
+ (setq pointer (cdr pointer))))))
+
(defun riece-uninstall-addon (addon &optional verbose)
(if (not (get addon 'riece-addon-insinuated))
(if verbose
(message "Add-on %S is not insinuated" addon))
(let ((entry (assq addon riece-addon-dependencies))
- (enabled (intern-soft (concat (symbol-name addon) "-enabled"))))
+ (enabled (intern-soft (concat (symbol-name addon) "-enabled")))
+ (uninstall (intern-soft (concat (symbol-name addon) "-uninstall"))))
(if entry
(if (cdr entry)
- (error "Dependency problem: %S <- %S" addon (cdr entry))
+ (if (= (length (cdr entry)) 1)
+ (error "%S depends on %S" (car (cdr entry)) addon)
+ (error "%s depend on %S"
+ (mapconcat #'symbol-name (cdr entry) ", ")
+ addon))
(if (and enabled
+ (boundp enabled)
(symbol-value enabled))
(riece-disable-addon addon verbose))
- (funcall (or (intern-soft (concat (symbol-name addon)
- "-uninstall"))
- #'ignore))
+ (if (and uninstall
+ (fboundp uninstall))
+ (funcall uninstall))
(setq riece-addon-dependencies
(delq entry riece-addon-dependencies))
- (remprop addon 'riece-addon-insinuated)
+ (riece-remprop addon 'riece-addon-insinuated)
(setq riece-addons (delq addon riece-addons)
- riece-addon-dependencies (riece-resolve-addons
- (copy-sequence riece-addons)))))
+ riece-save-variables-are-dirty t
+ riece-addon-dependencies
+ (riece-resolve-addons
+ (delq addon (mapcar #'car riece-addon-dependencies))))))
(if verbose
(message "Add-on %S is uninstalled" addon)))))
(unless (get addon 'riece-addon-insinuated)
(error "Add-on %S is not insinuated" addon))
(let ((enabled (intern-soft (concat (symbol-name addon) "-enabled"))))
- (if (null enabled)
+ (if (or (null enabled)
+ (not (boundp enabled)))
(if verbose
(message "Add-on %S doesn't support enable/disable" addon))
(if (symbol-value enabled)
(unless (get addon 'riece-addon-insinuated)
(error "Add-on %S is not insinuated" addon))
(let ((enabled (intern-soft (concat (symbol-name addon) "-enabled"))))
- (if (null enabled)
+ (if (or (null enabled)
+ (not (boundp enabled)))
(if verbose
(message "Add-on %S doesn't support enable/disable" addon))
(if (symbol-value enabled)
(defun riece-command-list-addons ()
(interactive)
- (set-buffer (riece-get-buffer-create "*AddOns*" 'riece-addon-list-mode))
+ (set-buffer (riece-get-buffer-create "*AddOn*" 'riece-addon-list-mode))
(riece-addon-list-mode)
(let ((inhibit-read-only t)
buffer-read-only
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
+ (if (and description
+ (boundp description))
(symbol-value description)
"(no description)"))
module-description-alist)
(setq enabled (intern-soft (concat (symbol-name (car (car pointer)))
"-enabled")))
(setq point (point))
- (insert (format "%c %S: %s\n"
- (if (not (get (car (car pointer))
- 'riece-addon-insinuated))
+ (insert (format "%c %-15S %s\n"
+ (if (not (featurep (car (car pointer))))
?
- (if (null enabled)
- ?!
- (if (symbol-value enabled)
- ?+
- ?-)))
+ (if (not (get (car (car pointer))
+ 'riece-addon-insinuated))
+ ??
+ (if (null enabled)
+ ?!
+ (if (symbol-value enabled)
+ ?+
+ ?-))))
(car (car pointer))
(cdr (car pointer))))
(put-text-property point (point) 'riece-addon (car (car pointer)))
+ The add-on is enabled.
- The add-on is disabled.
! The add-on doesn't support enable/disable operation.
- The add-on is not insinuated.
+ ? The add-on is not insinuated.
+ The add-on is not loaded.
")
(insert (substitute-command-keys "
Useful keys:
(pop-to-buffer (current-buffer))
(delete-other-windows)))
+(defun riece-addon-list-set-point (addon)
+ (let ((point (point-min)))
+ (while (and (not (eq (get-text-property point 'riece-addon) addon))
+ (setq point (next-single-property-change point
+ 'riece-addon))))
+ (if point
+ (goto-char point))))
+
(defun riece-command-enable-addon (addon)
(interactive
(list
(riece-enable-addon addon t)
(when (eq major-mode 'riece-addon-list-mode)
(riece-command-list-addons)
- (let ((point (point-min)))
- (while (and (not (eq (get-text-property point 'riece-addon) addon))
- (setq point (next-single-property-change point
- 'riece-addon))))
- (if point
- (goto-char point)))))
+ (riece-addon-list-set-point addon)))
(defun riece-command-disable-addon (addon)
(interactive
(riece-disable-addon addon t)
(when (eq major-mode 'riece-addon-list-mode)
(riece-command-list-addons)
- (let ((point (point-min)))
- (while (and (not (eq (get-text-property point 'riece-addon) addon))
- (setq point (next-single-property-change point
- 'riece-addon))))
- (if point
- (goto-char point)))))
+ (riece-addon-list-set-point addon)))
(defun riece-command-insinuate-addon (addon)
(interactive
(list (symbol-name (car dependency))))
riece-addon-modules)
(lambda (pointer)
- (get (car pointer) 'riece-addon-insinuated))
+ (not (get (car pointer) 'riece-addon-insinuated)))
t)))))
(riece-insinuate-addon addon t)
(when (eq major-mode 'riece-addon-list-mode)
(riece-command-list-addons)
- (let ((point (point-min)))
- (while (and (not (eq (get-text-property point 'riece-addon) addon))
- (setq point (next-single-property-change point
- 'riece-addon))))
- (if point
- (goto-char point)))))
+ (riece-addon-list-set-point addon)))
(defun riece-command-uninstall-addon (addon)
(interactive
(mapcar (lambda (dependency)
(list (symbol-name (car dependency))))
riece-addon-dependencies)
- nil t)))))
+ (lambda (pointer)
+ (get (car pointer) 'riece-addon-insinuated))
+ t)))))
+ (riece-uninstall-addon addon t)
+ (when (eq major-mode 'riece-addon-list-mode)
+ (riece-command-list-addons)
+ (riece-addon-list-set-point addon)))
+
+(defun riece-command-unload-addon (addon)
+ (interactive
+ (list
+ (or (if (eq major-mode 'riece-addon-list-mode)
+ (get-text-property (point) 'riece-addon))
+ (intern-soft
+ (completing-read "Add-on: "
+ (mapcar (lambda (dependency)
+ (list (symbol-name (car dependency))))
+ riece-addon-dependencies)
+ (lambda (pointer)
+ (get (car pointer) 'riece-addon-insinuated))
+ t)))))
(riece-uninstall-addon addon t)
+ (if (get addon 'riece-addon-not-unloadable)
+ (message "Add-on %S is not allowed to unload" addon)
+ (unload-feature addon)
+ (message "Add-on %S is unloaded" addon))
(when (eq major-mode 'riece-addon-list-mode)
(riece-command-list-addons)
- (let ((point (point-min)))
- (while (and (not (eq (get-text-property point 'riece-addon) addon))
- (setq point (next-single-property-change point
- 'riece-addon))))
- (if point
- (goto-char point)))))
+ (riece-addon-list-set-point addon)))
(provide 'riece-addon)
projects / riece / blobdiff