(require 'riece-compat)
(require 'riece-misc)
(require 'riece-addon-modules)
+(require 'riece-mcat)
(defgroup riece-addon-list nil
"Add-on listing."
(?? . riece-addon-list-uninstalled-face)
(? . riece-addon-list-unloaded-face))
"An alist mapping marks on riece-addon-list-buffer to faces."
- :type 'list
+ :type '(repeat (cons character symbol))
:group 'riece-addon-list)
(defcustom riece-addon-list-font-lock-keywords
(defun riece-insinuate-addon-1 (addon verbose)
(if (get addon 'riece-addon-insinuated)
(if verbose
- (message "Add-on %S is already insinuated" addon))
+ (message (riece-mcat "Add-on %S is already insinuated") addon))
(require addon)
(funcall (intern (concat (symbol-name addon) "-insinuate")))
(put addon 'riece-addon-insinuated t)
(if verbose
- (message "Add-on %S is insinuated" addon))
+ (message (riece-mcat "Add-on %S is insinuated") addon))
(unless (get addon 'riece-addon-default-disabled)
(riece-enable-addon addon t))))
(setq addons (nreverse addons))
(if (and (> (length addons) 1)
(eq verbose 'ask)
- (not (y-or-n-p (format "%s will be insinuated. Continue? "
+ (not (y-or-n-p (format (riece-mcat
+ "%s will be insinuated. Continue? ")
(mapconcat #'symbol-name addons ", ")))))
(error "Insinuate operation was cancelled"))
(while addons
(defun riece-uninstall-addon (addon &optional verbose)
(if (not (get addon 'riece-addon-insinuated))
(if verbose
- (message "Add-on %S is not insinuated" addon))
+ (message (riece-mcat "Add-on %S is not insinuated") addon))
(let ((entry (assq addon riece-addon-dependencies))
(uninstall (intern-soft (concat (symbol-name addon) "-uninstall"))))
(if entry
(riece-resolve-addons
(delq addon (mapcar #'car riece-addon-dependencies))))))
(if verbose
- (message "Add-on %S is uninstalled" addon)))))
+ (message (riece-mcat "Add-on %S is uninstalled") addon)))))
(defun riece-enable-addon (addon &optional verbose)
(unless (get addon 'riece-addon-insinuated)
(error "Add-on %S is not insinuated" addon))
(if (get addon 'riece-addon-enabled)
(if verbose
- (message "Add-on %S is already enabled" addon))
+ (message (riece-mcat "Add-on %S is already enabled") addon))
(let ((enable (intern-soft (concat (symbol-name addon) "-enable"))))
(if (and enable
(fboundp enable))
(funcall enable))
(put addon 'riece-addon-enabled t)
(if verbose
- (message "Add-on %S enabled" addon)))))
+ (message (riece-mcat "Add-on %S enabled") addon)))))
(defun riece-disable-addon (addon &optional verbose)
(unless (get addon 'riece-addon-insinuated)
(error "Add-on %S is not insinuated" addon))
(if (not (get addon 'riece-addon-enabled))
(if verbose
- (message "Add-on %S is already disabled" addon))
+ (message (riece-mcat "Add-on %S is already disabled") addon))
(let ((disable (intern-soft (concat (symbol-name addon) "-disable"))))
(if (and disable
(fboundp disable))
(funcall disable))
(put addon 'riece-addon-enabled nil)
(if verbose
- (message "Add-on %S disabled" addon)))))
+ (message (riece-mcat "Add-on %S disabled") addon)))))
(put 'riece-addon-list-mode 'font-lock-defaults
'(riece-addon-list-font-lock-keywords t))
(cons (cons (car (car pointer))
(if (and description
(boundp description))
- (symbol-value description)
- "(no description)"))
+ (riece-mcat (symbol-value description))
+ (riece-mcat "(no description)")))
module-description-alist)
pointer (cdr pointer)))
(setq pointer riece-addon-modules)
(unless (assq (car (car pointer))
module-description-alist)
(setq module-description-alist
- (cons (car pointer) module-description-alist)))
+ (cons (cons (car (car pointer)) (riece-mcat (cdr (car pointer))))
+ module-description-alist)))
(setq pointer (cdr pointer)))
(erase-buffer)
(riece-kill-all-overlays)
(cdr (car pointer))))
(put-text-property point (point) 'riece-addon (car (car pointer)))
(setq pointer (cdr pointer)))
- (insert "
+ (insert (riece-mcat "
Symbols in the leftmost column:
+ The add-on is enabled.
- The add-on is disabled.
? The add-on is not insinuated.
The add-on is not loaded.
-")
- (insert (substitute-command-keys "
+"))
+ (insert (substitute-command-keys (riece-mcat "
Useful keys:
`\\[riece-command-enable-addon]' to enable the current add-on.
`\\[riece-command-uninstall-addon]' to uninstall the current add-on.
`\\[riece-command-unload-addon]' to unload the current add-on.
`\\[riece-command-save-variables]' to save the current setting.
-"))
+")))
(goto-char (point-min))
(pop-to-buffer (current-buffer))
(delete-other-windows)))
(or (if (eq major-mode 'riece-addon-list-mode)
(get-text-property (point) 'riece-addon))
(intern-soft
- (completing-read "Add-on: "
+ (completing-read (riece-mcat "Add-on: ")
(mapcar (lambda (dependency)
(list (symbol-name (car dependency))))
riece-addon-dependencies)
(or (if (eq major-mode 'riece-addon-list-mode)
(get-text-property (point) 'riece-addon))
(intern-soft
- (completing-read "Add-on: "
+ (completing-read (riece-mcat "Add-on: ")
(mapcar (lambda (dependency)
(list (symbol-name (car dependency))))
riece-addon-dependencies)
(or (if (eq major-mode 'riece-addon-list-mode)
(get-text-property (point) 'riece-addon))
(intern-soft
- (completing-read "Add-on: "
+ (completing-read (riece-mcat "Add-on: ")
(mapcar (lambda (dependency)
(list (symbol-name (car dependency))))
riece-addon-modules)
(lambda (pointer)
- (not (get (car pointer) 'riece-addon-insinuated)))
+ (not (get (intern-soft (car pointer))
+ 'riece-addon-insinuated)))
t)))))
(riece-insinuate-addon addon 'ask)
(when (eq major-mode 'riece-addon-list-mode)
(or (if (eq major-mode 'riece-addon-list-mode)
(get-text-property (point) 'riece-addon))
(intern-soft
- (completing-read "Add-on: "
+ (completing-read (riece-mcat "Add-on: ")
(mapcar (lambda (dependency)
(list (symbol-name (car dependency))))
riece-addon-dependencies)
(lambda (pointer)
- (get (car pointer) 'riece-addon-insinuated))
+ (get (intern-soft (car pointer))
+ 'riece-addon-insinuated))
t)))))
(riece-uninstall-addon addon t)
(when (eq major-mode 'riece-addon-list-mode)
(or (if (eq major-mode 'riece-addon-list-mode)
(get-text-property (point) 'riece-addon))
(intern-soft
- (completing-read "Add-on: "
+ (completing-read (riece-mcat "Add-on: ")
(mapcar (lambda (dependency)
(list (symbol-name (car dependency))))
riece-addon-dependencies)
(lambda (pointer)
- (get (car pointer) 'riece-addon-insinuated))
+ (get (intern-soft (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)
+ (message (riece-mcat "Add-on %S is not allowed to unload") addon)
(unload-feature addon)
- (message "Add-on %S is unloaded" addon))
+ (message (riece-mcat "Add-on %S is unloaded") addon))
(when (eq major-mode 'riece-addon-list-mode)
(riece-command-list-addons)
(riece-addon-list-set-point addon)))