X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-addon.el;h=671ba2eedee8433c513e991b58b13bd0ad33473c;hb=dc8c36353762a4e7b143e396019244e2d75821a9;hp=163e1e8b3e6f08dee3b89e3a23a0243ceededa13;hpb=2c01d3c570555b08cc9734cfdcbcecb1044ba662;p=elisp%2Friece.git diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el index 163e1e8..671ba2e 100644 --- a/lisp/riece-addon.el +++ b/lisp/riece-addon.el @@ -19,8 +19,8 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Code: @@ -29,6 +29,7 @@ (require 'riece-compat) (require 'riece-misc) (require 'riece-addon-modules) +(require 'riece-mcat) (defgroup riece-addon-list nil "Add-on listing." @@ -60,15 +61,6 @@ :group 'riece-addon-list-faces) (defvar riece-addon-list-disabled-face 'riece-addon-list-disabled-face) -(defface riece-addon-list-unsupported-face - '((((class color) (background dark)) - (:foreground "PaleTurquoise")) - (t - ())) - "Face used for displaying the unsupported addon." - :group 'riece-addon-list-faces) -(defvar riece-addon-list-unsupported-face 'riece-addon-list-unsupported-face) - (defface riece-addon-list-uninstalled-face '((t (:italic t))) @@ -99,7 +91,6 @@ (defcustom riece-addon-list-mark-face-alist '((?+ . riece-addon-list-enabled-face) (?- . riece-addon-list-disabled-face) - (?! . riece-addon-list-unsupported-face) (?? . riece-addon-list-uninstalled-face) (? . riece-addon-list-unloaded-face)) "An alist mapping marks on riece-addon-list-buffer to faces." @@ -107,7 +98,7 @@ :group 'riece-addon-list) (defcustom riece-addon-list-font-lock-keywords - '(("^\\([-+!? ] \\S-+\\)\\s-+\\(.*\\)" + '(("^\\([-+? ] \\S-+\\)\\s-+\\(.*\\)" (1 (cdr (assq (aref (match-string 1) 0) riece-addon-list-mark-face-alist))) (2 riece-addon-list-description-face))) @@ -115,6 +106,9 @@ :type '(repeat (list string)) :group 'riece-addon-list) +(eval-when-compile + (autoload 'riece-command-save-variables "riece-commands")) + (defvar riece-addon-list-mode-map (let ((keymap (make-sparse-keymap))) (define-key keymap "+" 'riece-command-enable-addon) @@ -127,6 +121,7 @@ (define-key keymap " " 'scroll-up) (define-key keymap [delete] 'scroll-down) (define-key keymap "q" 'bury-buffer) + (define-key keymap "s" 'riece-command-save-variables) keymap)) (defun riece-load-and-build-addon-dependencies (addons) @@ -211,12 +206,12 @@ (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)))) @@ -235,18 +230,21 @@ (if (eq (car (car pointer)) addon) (setq pointer nil) (setq pointer (cdr pointer)))) - (if (if (eq verbose 'ask) - (y-or-n-p (format "%s will be insinuated. Continue?" - (mapconcat #'symbol-name addons ", "))) - verbose) - (while addons - (riece-insinuate-addon-1 (car addons) verbose) - (setq addons (cdr addons)))))) + (setq addons (nreverse addons)) + (if (and (> (length addons) 1) + (eq verbose 'ask) + (not (y-or-n-p (format (riece-mcat + "%s will be insinuated. Continue? ") + (mapconcat #'symbol-name addons ", "))))) + (error "Insinuate operation was cancelled")) + (while addons + (riece-insinuate-addon-1 (car addons) verbose) + (setq addons (cdr 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 @@ -269,40 +267,35 @@ (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)) - (let ((enable (intern-soft (concat (symbol-name addon) "-enable")))) - (if (or (null enable) - (not (fboundp enable))) - (if verbose - (message "Add-on %S doesn't support enable/disable" addon)) - (if (get addon 'riece-addon-enabled) - (if verbose - (message "Add-on %S is already enabled" addon)) - (funcall enable) - (put addon 'riece-addon-enabled t) - (if verbose - (message "Add-on %S enabled" addon)))))) + (if (get addon 'riece-addon-enabled) + (if verbose + (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 (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)) - (let ((disable (intern-soft (concat (symbol-name addon) "-disable")))) - (if (or (null disable) - (not (fboundp disable))) - (if verbose - (message "Add-on %S doesn't support enable/disable" addon)) - (if (get addon 'riece-addon-enabled) - (progn - (funcall disable) - (put addon 'riece-addon-enabled nil) - (if verbose - (message "Add-on %S disabled" addon))) - (if verbose - (message "Add-on %S is already enabled" addon)))))) + (if (not (get addon 'riece-addon-enabled)) + (if verbose + (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 (riece-mcat "Add-on %S disabled") addon))))) (put 'riece-addon-list-mode 'font-lock-defaults '(riece-addon-list-font-lock-keywords t)) @@ -334,7 +327,7 @@ All normal editing commands are turned off." buffer-read-only (pointer riece-addon-dependencies) module-description-alist - description enable point) + description point longest) (while pointer (setq description (intern-soft (concat (symbol-name (car (car pointer))) "-description")) @@ -343,7 +336,7 @@ All normal editing commands are turned off." (if (and description (boundp description)) (symbol-value description) - "(no description)")) + (riece-mcat "(no description)"))) module-description-alist) pointer (cdr pointer))) (setq pointer riece-addon-modules) @@ -355,48 +348,50 @@ 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 enable (intern-soft (concat (symbol-name (car (car pointer))) - "-enable"))) (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)) 'riece-addon-insinuated)) ?? - (if (or (null enable) - (not (fboundp enable))) - ?! - (if (get (car (car pointer)) 'riece-addon-enabled) - ?+ - ?-)))) + (if (get (car (car pointer)) 'riece-addon-enabled) + ?+ + ?-))) (car (car pointer)) (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 doesn't support enable/disable operation. ? 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-disable-addon]' to disable the current add-on. - `\\[riece-command-insinuate-addon]' to insinuate the add-on. + `\\[riece-command-insinuate-addon]' to insinuate 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))) @@ -415,7 +410,7 @@ Useful keys: (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) @@ -426,6 +421,7 @@ Useful keys: (and enabled (null (symbol-value enabled))))) t))))) + (riece-command-insinuate-addon addon) (riece-enable-addon addon t) (when (eq major-mode 'riece-addon-list-mode) (riece-command-list-addons) @@ -437,7 +433,7 @@ Useful keys: (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) @@ -459,7 +455,7 @@ Useful keys: (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) @@ -477,7 +473,7 @@ Useful keys: (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) @@ -495,7 +491,7 @@ Useful keys: (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) @@ -504,9 +500,9 @@ Useful keys: 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)))