Don't add the path of "custom" to `load-path'.

[elisp/apel.git] / APEL-CFG

diff --git a/APEL-CFG b/APEL-CFG
index 3d46908..cce20e7 100644 (file)
--- a/APEL-CFG
+++ b/APEL-CFG
@@ -8,7 +8,6 @@
 (setq load-path (cons (expand-file-name ".") load-path))
 (require 'install)
 
-
 ;;; @ Please specify prefix of install directory.
 ;;;
 
@@ -19,7 +18,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 +32,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.
@@ -42,6 +43,7 @@
 ;; (setq install-default-elisp-directory "~/lib/emacs/lisp")
 
 (setq APEL_DIR (expand-file-name APEL_PREFIX LISPDIR))
+;; (setq APEL_DIR (expand-file-name APEL_PREFIX VERSION_SPECIFIC_LISPDIR))
 
 (defvar PACKAGEDIR
   (if (boundp 'early-packages)