Sync up with flim-1_10_4.

diff --git a/ChangeLog b/ChangeLog
index ea15e85..592e922 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+1998-10-12  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * README.en: Add explanation about `VERSION_SPECIFIC_LISPDIR'.
+
+       * Makefile (install): Add new arg `VERSION_SPECIFIC_LISPDIR'.
+       (elc): Likewise.
+
+       * FLIM-MK (config-flim): Refer to `VERSION_SPECIFIC_LISPDIR'.
+
+       * FLIM-CFG (VERSION_SPECIFIC_LISPDIR): New variable.
+
+1998-10-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * mel.el (mel-ccl-module): Require path-util when the running
+       emacs has MULE.
+
+       * mel.el: Don't require emu.
+
+1998-10-11  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * FLIM-ELS: Don't install mel-ccl in anything older than XEmacs 21
+       with MULE.
+
+\f
 1998-10-10  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * mel-ccl.el (base64-ccl-write-decoded-region): bind

diff --git a/FLIM-CFG b/FLIM-CFG
index 894af45..57565ab 100644 (file)
--- a/FLIM-CFG
+++ b/FLIM-CFG
@@ -16,9 +16,15 @@
       (add-to-list 'load-path (expand-file-name "apel" LISPDIR))
       ))
 
+(defvar VERSION_SPECIFIC_LISPDIR nil)
+
+(if VERSION_SPECIFIC_LISPDIR
+    (add-to-list 'load-path VERSION_SPECIFIC_LISPDIR))
+
 (require 'install)
 
 (add-latest-path "custom")
+
 (add-path default-directory)
 
 (or (fboundp 'write-region-as-binary)

diff --git a/FLIM-ELS b/FLIM-ELS
index 380e5dc..3e8e347 100644 (file)
--- a/FLIM-ELS
+++ b/FLIM-ELS
@@ -16,7 +16,9 @@
   )
 
 (if (and (featurep 'mule)
-        (not (and (boundp 'MULE) MULE)))
+        (not (or (and (boundp 'MULE) MULE)
+                 (and (featurep 'xemacs) (< emacs-major-version 21))
+                 )))
     (setq flim-modules (cons 'mel-ccl flim-modules))
   )
 

diff --git a/FLIM-MK b/FLIM-MK
index 9fcf319..d4ad43e 100644 (file)
--- a/FLIM-MK
+++ b/FLIM-MK
@@ -1,10 +1,10 @@
 ;;; -*-Emacs-Lisp-*-
 ;;;
-;;; $Id: FLIM-MK,v 1.3 1998-09-11 23:14:03 morioka Exp $
+;;; $Id: FLIM-MK,v 1.3.8.1 1998-10-12 13:38:12 morioka Exp $
 ;;;
 
 (defun config-flim ()
-  (let (prefix lisp-dir)
+  (let (prefix lisp-dir version-specific-lisp-dir)
     (and (setq prefix (car command-line-args-left))
         (or (string-equal "NONE" prefix)
             (defvar PREFIX prefix)
@@ -15,6 +15,14 @@
             (defvar LISPDIR lisp-dir)
             ))
     (setq command-line-args-left (cdr command-line-args-left))
+    (and (setq version-specific-lisp-dir (car command-line-args-left))
+        (or (string-equal "NONE" version-specific-lisp-dir)
+            (progn
+              (defvar VERSION_SPECIFIC_LISPDIR version-specific-lisp-dir)
+              (princ (format "VERSION_SPECIFIC_LISPDIR=%s\n"
+                             VERSION_SPECIFIC_LISPDIR)))
+            ))
+    (setq command-line-args-left (cdr command-line-args-left))
     (load-file "FLIM-CFG")
     (load-file "FLIM-ELS")
     (princ (format "PREFIX=%s

diff --git a/FLIM-VERSION b/FLIM-VERSION
index 1dfc351..a44cbf1 100644 (file)
--- a/FLIM-VERSION
+++ b/FLIM-VERSION
@@ -26,7 +26,7 @@
 1.10.1 Miyamaki                \e$(B;0;3LZ\e(B
 1.10.2 Kintetsu-Miyazu         \e$(B6aE45\DE\e(B
 1.10.3 Komada                  \e$(B9}ED\e(B
------  Shin-H\e-Dòsono\e-A               \e$(B?7=K1`\e(B           ; <=> JR \e$(BJRD.@~\e(B \e$(B=K1`\e(B
+1.10.4 Shin-H\e-Dòsono\e-A               \e$(B?7=K1`\e(B           ; <=> JR \e$(BJRD.@~\e(B \e$(B=K1`\e(B
 -----  Kizugawadai             \e$(BLZDE@nBf\e(B
 -----  Yamadagawa              \e$(B;3ED@n\e(B
 -----  Takanohara              \e$(B9b$N86\e(B
@@ -64,3 +64,4 @@
 1.11.1 Kuramaguchi             \e$(B0HGO8}\e(B
 1.11.2 Kita\e-Dòji\e-A                   \e$(BKLBgO)\e(B
 1.11.3 Kitayama                \e$(BKL;3\e(B
+1.11.4 Matugasaki              \e$(B>>%v:j\e(B

diff --git a/Makefile b/Makefile
index 5a7cd35..5315d48 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 #
 
 PACKAGE = flim-chao
-VERSION = 1.11.3
+VERSION = 1.11.4
 
 TAR    = tar
 RM     = /bin/rm -f
@@ -16,6 +16,7 @@ FLAGS   = -batch -q -no-site-file -l FLIM-MK
 PREFIX = NONE
 LISPDIR = NONE
 PACKAGEDIR = NONE
+VERSION_SPECIFIC_LISPDIR = NONE
 
 GOMI   = *.elc \
          *.cp *.cps *.ky *.kys *.fn *.fns *.vr *.vrs \
@@ -24,10 +25,12 @@ FILES       = README.?? Makefile FLIM-MK FLIM-CFG FLIM-ELS *.el ChangeLog
 
 
 elc:
-       $(EMACS) $(FLAGS) -f compile-flim $(PREFIX) $(LISPDIR)
+       $(EMACS) $(FLAGS) -f compile-flim $(PREFIX) $(LISPDIR) \
+               $(VERSION_SPECIFIC_LISPDIR)
 
 install:       elc
-       $(EMACS) $(FLAGS) -f install-flim $(PREFIX) $(LISPDIR)
+       $(EMACS) $(FLAGS) -f install-flim $(PREFIX) $(LISPDIR) \
+               $(VERSION_SPECIFIC_LISPDIR)
 
 
 package:

diff --git a/README.en b/README.en
index ce7ff24..4dce259 100644 (file)
--- a/README.en
+++ b/README.en
@@ -87,6 +87,12 @@ Installation
   emacs command is used (perhaps /usr/local/share/emacs/site-lisp or
   /usr/local/lib/xemacs/site-lisp).
 
+  If the emu modules (included in APEL package) have been installed in
+  the non-standard directory, you should specify where they will be
+  found, for example:
+
+       % make install VERSION_SPECIFIC_LISPDIR=~/elisp
+
   You can specify other optional settings by editing the file
   FLIM-CFG.  Please read comments in it.
 

diff --git a/mel.el b/mel.el
index 1b13f0b..bd4ea11 100644 (file)
--- a/mel.el
+++ b/mel.el
@@ -25,7 +25,6 @@
 
 ;;; Code:
 
-(require 'emu)
 (require 'mime-def)
 
 (defcustom mime-encoding-list
@@ -81,7 +80,10 @@ Content-Transfer-Encoding for it."
 
 (defvar mel-ccl-module
   (and (featurep 'mule)
-       (module-installed-p 'mel-ccl)))
+       (progn
+        (require 'path-util)
+        (module-installed-p 'mel-ccl)
+        )))
 
 (mel-use-module 'mel-b '("base64" "B"))
 (mel-use-module 'mel-q '("quoted-printable" "Q"))

diff --git a/mime-def.el b/mime-def.el
index 5883b7e..abb60f1 100644 (file)
--- a/mime-def.el
+++ b/mime-def.el
@@ -24,7 +24,7 @@
 
 ;;; Code:
 
-(defconst mime-library-product ["Chao" (1 11 3) "Kitayama"]
+(defconst mime-library-product ["Chao" (1 11 4) "Matugasaki"]
   "Product name, version number and code name of MIME-library package.")
 
 (defmacro mime-product-name (product)