* lisp/initz-globals.el (toplevel): Require `static'.

(initz-flavor): Use `static-if' instead of `if'.

diff --git a/ChangeLog b/ChangeLog
index 207f636..9768dfc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-14  OHASHI Akira  <bg66@koka-in.org>
+
+       * lisp/initz-globals.el (toplevel): Require `static'.
+       (initz-flavor): Use `static-if' instead of `if'.
+
 2002-05-11  OHASHI Akira  <bg66@koka-in.org>
 
        * lisp/initz-list.el (toplevel): Require `cl'.

diff --git a/lisp/initz-globals.el b/lisp/initz-globals.el
index 15c924d..38bcd97 100644 (file)
--- a/lisp/initz-globals.el
+++ b/lisp/initz-globals.el
@@ -28,6 +28,8 @@
 
 ;;; Code:
 
+(require 'static)
+
 (defconst initz-null-string "")
 
 (defconst initz-separator-string "-")
@@ -37,7 +39,7 @@
 (defconst initz-flavor
   (if (featurep 'xemacs)
       (concat "xemacs" (number-to-string emacs-major-version))
-    (if (featurep 'meadow)
+    (static-if (featurep 'meadow)
         (concat "meadow"
                 (let ((mver (Meadow-version)))
                  (if (string-match "Meadow-\\([0-9]+\\.[0-9]+\\)"