From: tomo <tomo>
Date: Thu, 19 Aug 1999 04:49:27 +0000 (+0000)
Subject: (load-path): Add "../apel" instead of "../emu"; add "../flim" instead
X-Git-Tag: tm-8_1~25
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f2b3d48e218f4095474ecb0588882e91af2b6a07;p=elisp%2Ftm.git

(load-path): Add "../apel" instead of "../emu"; add "../flim" instead
of "../mel".
(APEL_PREFIX): New variable.
(FLIM_PREFIX): New variable; delete `MEL_PREFIX'.
(APEL_DIR): New variable.
(FLIM_DIR): New variable; delete `MEL_DIR'.
(FLIM_RELATIVE_DIR): New variable; delete `MEL_RELATIVE_DIR'.
(APEL_RELATIVE_DIR): New variable.
---

diff --git a/TM-CFG b/TM-CFG
index 21da4c9..56c4935 100644
--- a/TM-CFG
+++ b/TM-CFG
@@ -9,8 +9,8 @@
 			  (lambda (path)
 			    (expand-file-name path default-directory)
 			    ))
-			 '("." "../emu" "../tl" "../bitmap-mule"
-			   "../mu" "../mel"
+			 '("." "../apel" "../tl" "../bitmap-mule"
+			   "../mu" "../flim"
 			   "../tm-mh-e" "../gnus-mime" "../tm-gnus"
 			   "../tm-mail" "../tm-vm")
 			 )
@@ -112,6 +112,12 @@
 	  "emu"
 	""))
 
+;; Please specify emu prefix [optional]
+(setq APEL_PREFIX
+      (if (string-match "XEmacs" emacs-version)
+	  "apel"
+	""))
+
 ;; Please specify tl prefix [optional]
 ;;(setq TL_PREFIX "tl")
 (setq TL_PREFIX
@@ -125,8 +131,8 @@
 ;; Please specify MU prefix [optional]
 (setq MU_PREFIX "mu")
 
-;; Please specify MEL prefix [optional]
-(setq MEL_PREFIX "mel")
+;; Please specify FLIM prefix [optional]
+(setq FLIM_PREFIX "flim")
 
 ;; Please specify tm prefix [optional]
 (setq TM_PREFIX "tm")
@@ -188,10 +194,11 @@
 ;; Please specify mime-setup.{el|elc} install path.
 (setq SETUP_FILE_DIR LISPDIR)
 
+(setq APEL_DIR		(expand-file-name APEL_PREFIX	LISPDIR))
 (setq TL_DIR		(expand-file-name TL_PREFIX	LISPDIR))
 (setq BITMAP_DIR	(expand-file-name BITMAP_PREFIX	LISPDIR))
 (setq MU_DIR		(expand-file-name MU_PREFIX	LISPDIR))
-(setq MEL_DIR		(expand-file-name MEL_PREFIX	LISPDIR))
+(setq FLIM_DIR		(expand-file-name FLIM_PREFIX	LISPDIR))
 (setq TM_KERNEL_DIR	(expand-file-name TM_PREFIX	LISPDIR))
 (setq TM_MHE_DIR	TM_KERNEL_DIR)
 (setq TM_GNUS_DIR	TM_KERNEL_DIR)
@@ -200,14 +207,18 @@
 (setq TM_VM_DIR		TM_KERNEL_DIR)
 
 (cond ((member LISPDIR default-load-path)
+       (setq APEL_RELATIVE_DIR		APEL_PREFIX)
        (setq TL_RELATIVE_DIR		TL_PREFIX)
        (setq BITMAP_RELATIVE_DIR	BITMAP_PREFIX)
        (setq MU_RELATIVE_DIR		MU_PREFIX)
-       (setq MEL_RELATIVE_DIR		MEL_PREFIX)
+       (setq FLIM_RELATIVE_DIR		FLIM_PREFIX)
        (setq TM_KERNEL_RELATIVE_DIR	TM_PREFIX)
        )
       ((string-match (concat "^" (regexp-quote (expand-file-name "~/")))
 		     LISPDIR)
+       (setq APEL_RELATIVE_DIR
+	     (concat "~/" (file-relative-name APEL_DIR "~/"))
+	     )
        (setq TL_RELATIVE_DIR
 	     (concat "~/" (file-relative-name TL_DIR "~/"))
 	     )
@@ -217,18 +228,19 @@
        (setq MU_RELATIVE_DIR
 	     (concat "~/" (file-relative-name MU_DIR "~/"))
 	     )
-       (setq MEL_RELATIVE_DIR
-	     (concat "~/" (file-relative-name MEL_DIR "~/"))
+       (setq FLIM_RELATIVE_DIR
+	     (concat "~/" (file-relative-name FLIM_DIR "~/"))
 	     )
        (setq TM_KERNEL_RELATIVE_DIR
 	     (concat "~/" (file-relative-name TM_KERNEL_DIR "~/"))
 	     )
        )
       (t
+       (setq APEL_RELATIVE_DIR		APEL_DIR)
        (setq TL_RELATIVE_DIR		TL_DIR)
        (setq BITMAP_RELATIVE_DIR	BITMAP_DIR)
        (setq MU_RELATIVE_DIR		MU_DIR)
-       (setq MEL_RELATIVE_DIR		MEL_DIR)
+       (setq FLIM_RELATIVE_DIR		FLIM_DIR)
        (setq TM_KERNEL_RELATIVE_DIR	TM_KERNEL_DIR)
        ))
 (setq TM_MHE_RELATIVE_DIR	TM_KERNEL_RELATIVE_DIR)