Synch with `flim-1_14' (to be continued).

diff --git a/FLIM-CFG b/FLIM-CFG
index fa56911..ceba7b3 100644 (file)
--- a/FLIM-CFG
+++ b/FLIM-CFG
@@ -10,14 +10,12 @@
     nil
   ;; Emacs 19.29 emulating function.
   (defun add-to-list (list-var element)
-    (set list-var (cons element (symbol-value list-var))))
-  )
+    (set list-var (cons element (symbol-value list-var)))))
 
 (if (boundp 'data-directory)
     nil
   ;; Emacs 19 emulating variable.
-  (defvar data-directory exec-directory)
-  )
+  (defvar data-directory exec-directory))
 
 (add-to-list 'load-path
             (expand-file-name "../../site-lisp/apel" data-directory))
@@ -26,8 +24,7 @@
     (progn
       (add-to-list 'default-load-path LISPDIR)
       (add-to-list 'load-path LISPDIR)
-      (add-to-list 'load-path (expand-file-name "apel" LISPDIR))
-      ))
+      (add-to-list 'load-path (expand-file-name "apel" LISPDIR))))
 
 (if (boundp 'VERSION_SPECIFIC_LISPDIR)
     (add-to-list 'load-path VERSION_SPECIFIC_LISPDIR))

diff --git a/FLIM-ELS b/FLIM-ELS
index abc3ce7..679aba5 100644 (file)
--- a/FLIM-ELS
+++ b/FLIM-ELS
@@ -5,7 +5,7 @@
 ;;; Code:
 
 (setq flim-modules '(std11
-                    luna mime-def
+                    luna lunit mime-def
                     mel mel-q mel-u mel-g
                     eword-decode eword-encode
                     mime mime-parse mmgeneric
@@ -17,13 +17,9 @@
 (setq flim-version-specific-modules '(mailcap))
 
 (setq hmac-modules '(hex-util
-                    hmac-def
-                    md5 md5-el md5-dl
-                    sha1 sha1-el sha1-dl
+                    hmac-def md5 sha1
                     hmac-md5 hmac-sha1))
 
-(setq flim-modules (nconc hmac-modules flim-modules))
-
 (if (and (fboundp 'base64-encode-string)
         (subrp (symbol-function 'base64-encode-string)))
     nil
@@ -35,4 +31,17 @@
 (unless-broken ccl-usable
   (setq flim-modules (cons 'mel-b-ccl (cons 'mel-q-ccl flim-modules))))
 
+(if (and (fboundp 'md5)
+        (subrp (symbol-function 'md5)))
+    nil
+  (if (fboundp 'dynamic-link)
+      (setq hmac-modules (cons 'md5-dl hmac-modules))
+    (setq hmac-modules (cons 'md5-el hmac-modules))))
+
+(if (fboundp 'dynamic-link)
+    (setq hmac-modules (cons 'sha1-dl hmac-modules))
+  (setq hmac-modules (cons 'sha1-el hmac-modules)))
+
+(setq flim-modules (nconc hmac-modules flim-modules))
+
 ;;; FLIM-ELS ends here

diff --git a/FLIM-MK b/FLIM-MK
index 5038f50..701ff61 100644 (file)
--- a/FLIM-MK
+++ b/FLIM-MK
@@ -8,54 +8,62 @@
   (let (prefix lisp-dir version-specific-lisp-dir)
     (and (setq prefix (car command-line-args-left))
         (or (string-equal "NONE" prefix)
-            (defvar PREFIX prefix)
-            ))
+            (defvar PREFIX prefix)))
     (setq command-line-args-left (cdr command-line-args-left))
     (and (setq lisp-dir (car command-line-args-left))
         (or (string-equal "NONE" lisp-dir)
-            (defvar LISPDIR lisp-dir)
-            ))
+            (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)))
-            ))
+                             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
-LISPDIR=%s\n" PREFIX LISPDIR))
-    ))
+LISPDIR=%s\n" PREFIX LISPDIR))))
 
 (defun compile-flim ()
   (config-flim)
   (compile-elisp-modules flim-version-specific-modules ".")
-  (compile-elisp-modules flim-modules ".")
-  )
+  (compile-elisp-modules flim-modules "."))
 
 (defun install-flim ()
   (config-flim)
   (install-elisp-modules flim-version-specific-modules "./"
                         FLIM_VERSION_SPECIFIC_DIR)
-  (install-elisp-modules flim-modules "./" FLIM_DIR)
-  )
+  (install-elisp-modules flim-modules "./" FLIM_DIR))
+
+(defun check-flim ()
+  (config-flim)
+  (require 'lunit)
+  (let ((files (directory-files "tests" t))
+       (suite (lunit-make-test-suite)))
+    (while files
+      (if (file-regular-p (car files))
+         (progn
+           (load-file (car files))
+           (lunit-test-suite-add-test
+            suite (lunit-make-test-suite-from-class
+                   (intern (file-name-sans-extension
+                            (file-name-nondirectory (car files))))))))
+      (setq files (cdr files)))
+    (lunit suite)))
 
 (defun config-flim-package ()
   (let (package-dir)
     (and (setq package-dir (car command-line-args-left))
         (or (string= "NONE" package-dir)
-            (defvar PACKAGEDIR package-dir)
-            ))
+            (defvar PACKAGEDIR package-dir)))
     (setq command-line-args-left (cdr command-line-args-left))
     (load-file "FLIM-CFG")
     (load-file "FLIM-ELS")
     (setq flim-modules (append flim-modules
                               '(auto-autoloads custom-load)))
-    (princ (format "PACKAGEDIR=%s\n" PACKAGEDIR))
-    ))
+    (princ (format "PACKAGEDIR=%s\n" PACKAGEDIR))))
 
 (defun compile-flim-package ()
   (config-flim-package)
@@ -68,8 +76,7 @@ LISPDIR=%s\n" PREFIX LISPDIR))
   (Custom-make-dependencies)
 
   (compile-elisp-modules flim-version-specific-modules ".")
-  (compile-elisp-modules flim-modules ".")
-  )
+  (compile-elisp-modules flim-modules "."))
 
 (defun install-flim-package ()
   (config-flim-package)
@@ -80,7 +87,6 @@ LISPDIR=%s\n" PREFIX LISPDIR))
                                           (expand-file-name "lisp"
                                                             PACKAGEDIR)))
   (delete-file "./auto-autoloads.el")
-  (delete-file "./custom-load.el")
-  )
+  (delete-file "./custom-load.el"))
 
 ;;; FLIM-MK ends here

diff --git a/Makefile b/Makefile
index 642d346..12d4325 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,10 @@ elc:
        $(EMACS) $(FLAGS) -f compile-flim $(PREFIX) $(LISPDIR) \
                $(VERSION_SPECIFIC_LISPDIR)
 
+check:
+       $(EMACS) $(FLAGS) -f check-flim $(PREFIX) $(LISPDIR) \
+               $(VERSION_SPECIFIC_LISPDIR)
+
 install:       elc
        $(EMACS) $(FLAGS) -f install-flim $(PREFIX) $(LISPDIR) \
                $(VERSION_SPECIFIC_LISPDIR)

diff --git a/README.en b/README.en
index 8ded084..6789509 100644 (file)
--- a/README.en
+++ b/README.en
@@ -39,7 +39,7 @@ What's FLIM
 Installation
 ============
 
-(0) before installing it, please install APEL (9.22 or later) package.
+(0) before installing it, please install APEL (10.3 or later) package.
     APEL package is available at:
 
        ftp://ftp.m17n.org/pub/mule/apel/
@@ -81,6 +81,7 @@ Installation
   will create the following directory tree:
 
        /usr/local/share/emacs/site-lisp/flim/   --- FLIM
+       /usr/local/share/emacs/19.34/site-lisp/flim/    --- FLIM
 
   You can specify site-lisp directory, for example
 

diff --git a/README.ja b/README.ja
index 467c9d4..5c1d858 100644 (file)
--- a/README.ja
+++ b/README.ja
@@ -37,7 +37,7 @@ FLIM \e$B$H$O!)\e(B
 \e$BF3F~\e(B (install)
 ==============
 
-(0) \e$BF3F~\e(B (install) \e$B$9$kA0$K!"\e(BAPEL (9.19 \e$B0J9_\e(B) \e$B$rF3F~$7$F$/$@$5$$!#\e(BAPEL 
+(0) \e$BF3F~\e(B (install) \e$B$9$kA0$K!"\e(BAPEL (10.3 \e$B0J9_\e(B) \e$B$rF3F~$7$F$/$@$5$$!#\e(BAPEL 
     \e$B$O0J2<$N$H$3$m$G<hF@$G$-$^$9\e(B:
 
        ftp://ftp.m17n.org/pub/mule/apel/
@@ -82,6 +82,7 @@ FLIM \e$B$H$O!)\e(B
   \e$B%/%H%j!<LZ$,:n@.$5$l$^$9!#\e(B
 
        /usr/local/share/emacs/site-lisp/flim/  --- FLIM
+       /usr/local/share/emacs/19.34/site-lisp/flim/    --- FLIM
 
   Emacs Lisp \e$B%W%m%0%i%`$N$?$a$N\e(B lisp \e$B%G%#%l%/%H%j!<$r;XDj$9$k$3$H$,$G\e(B
   \e$B$-$^$9!#Nc$($P!"\e(B: