From c6444e65d4e3804c6c0bca81eb634b7761cfb7fe Mon Sep 17 00:00:00 2001 From: bg66 Date: Mon, 13 May 2002 16:12:48 +0000 Subject: [PATCH] * lisp/initz-globals.el (toplevel): Require `static'. (initz-flavor): Use `static-if' instead of `if'. --- ChangeLog | 5 +++++ lisp/initz-globals.el | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 207f636..9768dfc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-05-14 OHASHI Akira + + * lisp/initz-globals.el (toplevel): Require `static'. + (initz-flavor): Use `static-if' instead of `if'. + 2002-05-11 OHASHI Akira * lisp/initz-list.el (toplevel): Require `cl'. diff --git a/lisp/initz-globals.el b/lisp/initz-globals.el index 15c924d..38bcd97 100644 --- 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]+\\)" -- 1.7.10.4