X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=APEL-CFG;h=fa1c828562e9d60fda5fe277dcd5d69316d8679b;hb=41f25bfaf9361592b1945fc26f5fabdc4487212a;hp=3d469089184c761fa16c5305fc2a70bbe4d0581e;hpb=4614d5a5ed26252731d495d938a81e0ecefbf9cd;p=elisp%2Fapel.git

diff --git a/APEL-CFG b/APEL-CFG
index 3d46908..fa1c828 100644
--- a/APEL-CFG
+++ b/APEL-CFG
@@ -19,7 +19,9 @@
 
 ;; Please specify emu prefix [optional]
 (setq EMU_PREFIX
-      (if (string-match "XEmacs" emacs-version)
+      (if (or (featurep 'xemacs)
+	      (and (fboundp 'set-buffer-multibyte)
+		   (subrp (symbol-function 'set-buffer-multibyte))))
 	  "emu"
 	""))
 
@@ -31,10 +33,10 @@
 ;;; @ optional settings
 ;;;
 
-(setq EMU_DIR
-      (expand-file-name
-       EMU_PREFIX
-       (install-detect-elisp-directory PREFIX nil 'version-specific)))
+(defvar VERSION_SPECIFIC_LISPDIR
+  (install-detect-elisp-directory PREFIX nil 'version-specific))
+
+(setq EMU_DIR (expand-file-name EMU_PREFIX VERSION_SPECIFIC_LISPDIR))
 
 ;; It is generated by automatically. Please set variable `PREFIX'.
 ;; If you don't like default directory tree, please set it.