Mercurial > emacs
changeset 66716:25ad3e63f2a1
* mh-customize.el (mh-min-colors-defined-flag, mh-defface-compat):
Move to mh-init.el to minimize bulk of mh-customize.el.
* mh-init.el: Modify commentary since file is used for load and
initialization as well as setting and getting the variant.
(mh-min-colors-defined-flag, mh-defface-compat): Move here from
mh-customize.el.
| author | Bill Wohler <wohler@newt.com> |
|---|---|
| date | Sat, 05 Nov 2005 04:02:06 +0000 |
| parents | 5cec34d0f4d7 |
| children | 5271a20d9255 |
| files | lisp/mh-e/ChangeLog lisp/mh-e/mh-customize.el lisp/mh-e/mh-init.el |
| diffstat | 3 files changed, 39 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mh-e/ChangeLog Sat Nov 05 01:57:35 2005 +0000 +++ b/lisp/mh-e/ChangeLog Sat Nov 05 04:02:06 2005 +0000 @@ -1,5 +1,13 @@ 2005-11-04 Bill Wohler <wohler@newt.com> + * mh-customize.el (mh-min-colors-defined-flag, mh-defface-compat): + Move to mh-init.el to minimize bulk of mh-customize.el. + + * mh-init.el: Modify commentary since file is used for load and + initialization as well as setting and getting the variant. + (mh-min-colors-defined-flag, mh-defface-compat): Move + here from mh-customize.el. + * mh-customize.el: Refactor faces. Move grayscale requirements last before t. Use uniform line breaks. (mh-min-colors-defined-flag): New variable.
--- a/lisp/mh-e/mh-customize.el Sat Nov 05 01:57:35 2005 +0000 +++ b/lisp/mh-e/mh-customize.el Sat Nov 05 04:02:06 2005 +0000 @@ -2248,30 +2248,6 @@ ;;; Faces (:group 'mh-*-faces + group where faces described) -(defvar mh-min-colors-defined-flag (and (not mh-xemacs-flag) - (>= emacs-major-version 22)) - "Non-nil means defface supports min-colors display requirement.") - -(defun mh-defface-compat (spec) - "Converts SPEC for defface if necessary to run on older platforms. -See `defface' for the spec definition. - -When `mh-min-colors-defined-flag' is nil, this function finds a display with a -single \"class\" requirement with a \"color\" item, renames the requirement to -\"tty\" and moves it to the beginning of the list. It then strips any -\"min-colors\" requirements." - (when (not mh-min-colors-defined-flag) - ;; Insert ((class tty)) display with ((class color)) attributes. - (let ((attributes (cdr (assoc '((class color)) spec)))) - (cons (cons '((class tty)) attributes) spec)) - ;; Delete ((class color)) display. - (delq (assoc '((class color)) spec) spec) - ;; Strip min-colors. - (loop for entry in spec do - (when (not (eq (car entry) t)) - (if (assoc 'min-colors (car entry)) - (delq (assoc 'min-colors (car entry)) (car entry))))))) - ;;; Faces Used in Scan Listing (:group 'mh-folder-faces) (defvar mh-folder-body-face 'mh-folder-body
--- a/lisp/mh-e/mh-init.el Sat Nov 05 01:57:35 2005 +0000 +++ b/lisp/mh-e/mh-init.el Sat Nov 05 04:02:06 2005 +0000 @@ -26,12 +26,14 @@ ;;; Commentary: -;; Sets up the MH variant (currently nmh or MH). +;; Sets up the MH variant (currently nmh, MH, or GNU mailutils). ;; ;; Users may customize `mh-variant' to switch between available variants. ;; Available MH variants are described in the variable `mh-variants'. ;; Developers may check which variant is currently in use with the ;; variable `mh-variant-in-use' or the function `mh-variant-p'. +;; +;; Also contains code that is used at load or initialization time only. ;;; Change Log: @@ -300,6 +302,8 @@ (add-to-list 'mh-variants variant))))) mh-variants))) + + (defvar mh-image-load-path-called-flag nil) ;;;###mh-autoload @@ -325,6 +329,32 @@ (add-to-list 'load-path mh-image-load-path))) (setq mh-image-load-path-called-flag t))) + + +(defvar mh-min-colors-defined-flag (and (not mh-xemacs-flag) + (>= emacs-major-version 22)) + "Non-nil means defface supports min-colors display requirement.") + +(defun mh-defface-compat (spec) + "Converts SPEC for defface if necessary to run on older platforms. +See `defface' for the spec definition. + +When `mh-min-colors-defined-flag' is nil, this function finds a display with a +single \"class\" requirement with a \"color\" item, renames the requirement to +\"tty\" and moves it to the beginning of the list. It then strips any +\"min-colors\" requirements." + (when (not mh-min-colors-defined-flag) + ;; Insert ((class tty)) display with ((class color)) attributes. + (let ((attributes (cdr (assoc '((class color)) spec)))) + (cons (cons '((class tty)) attributes) spec)) + ;; Delete ((class color)) display. + (delq (assoc '((class color)) spec) spec) + ;; Strip min-colors. + (loop for entry in spec do + (when (not (eq (car entry) t)) + (if (assoc 'min-colors (car entry)) + (delq (assoc 'min-colors (car entry)) (car entry))))))) + (provide 'mh-init) ;;; Local Variables: