[Emacs-commit] emacs/lisp/mh-e mh-init.el mh-customize.el Chan...

[Bill Wohler]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Bill Wohler <address@hidden>    05/11/05 04:02:06

Modified files:
        lisp/mh-e      : mh-init.el mh-customize.el ChangeLog 

Log message:
        * 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.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/mh-e/mh-init.el.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/mh-e/mh-customize.el.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/mh-e/ChangeLog.diff?tr1=1.65&tr2=1.66&r1=text&r2=text

Patches:
Index: emacs/lisp/mh-e/ChangeLog
diff -u emacs/lisp/mh-e/ChangeLog:1.65 emacs/lisp/mh-e/ChangeLog:1.66
--- emacs/lisp/mh-e/ChangeLog:1.65      Sat Nov  5 01:57:35 2005
+++ emacs/lisp/mh-e/ChangeLog   Sat Nov  5 04:02:06 2005
@@ -1,5 +1,13 @@
 2005-11-04  Bill Wohler  <address@hidden>
 
+       * 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.
Index: emacs/lisp/mh-e/mh-customize.el
diff -u emacs/lisp/mh-e/mh-customize.el:1.34 
emacs/lisp/mh-e/mh-customize.el:1.35
--- emacs/lisp/mh-e/mh-customize.el:1.34        Sat Nov  5 01:57:35 2005
+++ emacs/lisp/mh-e/mh-customize.el     Sat Nov  5 04:02:06 2005
@@ -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
Index: emacs/lisp/mh-e/mh-init.el
diff -u emacs/lisp/mh-e/mh-init.el:1.12 emacs/lisp/mh-e/mh-init.el:1.13
--- emacs/lisp/mh-e/mh-init.el:1.12     Mon Oct 17 05:52:53 2005
+++ emacs/lisp/mh-e/mh-init.el  Sat Nov  5 04:02:06 2005
@@ -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: