Sync with emiko-1_14.

diff --git a/ChangeLog b/ChangeLog
index 25b3cc1..8f57e44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2007-06-18  Daiki Ueno  <ueno@unixuser.org>
+
+       * mime-edit.el (turn-on-mime-edit): Remove redundant comments and
+       newlines to make the amount of diff-lines minimal to the original.
+
+2007-06-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mime-edit.el (turn-on-mime-edit): Don't use the default values
+       of paragraph-start and paragraph-separate.  Suggested by Ron
+       Isaacson <Ron.Isaacson@morganstanley.com>.  cf.
+       http://article.gmane.org/gmane.mail.wanderlust.general.japanese/5721
+
+2007-04-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mime-edit.el (turn-on-mime-edit): Make paragraph-start and
+       paragraph-separate buffer-local.
+
 2007-03-08  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * mime-edit.el (mime-edit-sign-smime): Bind `mime-transfer-level'
@@ -10,6 +27,30 @@
        * mime-edit.el (mime-edit-sign-pgp-mime): Create a signature for
        binary document.
 
+2006-12-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * README.en (Required environment): Update required version of
+       APEL to 10.7 or later.
+
+       * SEMI-CFG (PACKAGEDIR): Use
+       `install-get-default-package-directory'.
+
+2006-12-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * SEMI-CFG (PACKAGEDIR): Avoid an error with Emacs.
+
+2006-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * SEMI-MK (compile-semi-package): Use
+       batch-update-directory-autoloads if it is available instead of
+       batch-update-directory.
+
+2006-12-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * SEMI-CFG (PACKAGEDIR): Check for
+       (early|late|last)-package-hierarchies and configure-package-path
+       as well as (early|late|last)-packages.
+
 2006-12-02  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
        * mime-edit.el (mime-edit-process-multipart-1): Don't insert a
@@ -620,7 +661,7 @@
 \f
 2000-12-25  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
-       * SEMI: Version 1.14.2 (Daish\e-Dòji)\e-A released.
+       * SEMI: Version 1.14.2 (Daish\e-Dòji) released.\e-A
 
        * README.en (Required environment): Update to FLIM 1.14.2.
 
@@ -906,7 +947,7 @@
 \f
 2000-07-12  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
-       * REMI: Version 1.14.2 (Hokuhoku-\e-DÒshima)\e-A released.
+       * REMI: Version 1.14.2 (Hokuhoku-\e-DÒshima) released.\e-A
 
        * README.en (Required environment): Modify for FLIM-Chao 1.14.1.
 
@@ -1000,7 +1041,7 @@
 \f
 2000-03-01  MORIOKA Tomohiko  <tomo@m17n.org>
 
-       * REMI: Version 1.14.1 (Mushigawa\e-Dòsugi)\e-A released.
+       * REMI: Version 1.14.1 (Mushigawa\e-Dòsugi) released.\e-A
 
 2000-03-01  MORIOKA Tomohiko  <tomo@m17n.org>
 
@@ -2084,7 +2125,7 @@
 \f
 1999-08-18  MORIOKA Tomohiko  <tomo@m17n.org>
 
-       * REMI: Version 1.13.2 (\e-DÒike-Ikoinomori)\e-A released.
+       * REMI: Version 1.13.2 (\e-DÒike-Ikoinomori) released.\e-A
 
 1999-08-17  Katsumi Yamaoka   <yamaoka@jpl.org>
 
@@ -2155,7 +2196,7 @@
 \f
 1999-07-27  MORIOKA Tomohiko  <tomo@m17n.org>
 
-       * SEMI: Version 1.13.5 (Meih\e-Dò)\e-A released.
+       * SEMI: Version 1.13.5 (Meih\e-Dò) released.\e-A
 
 1999-07-27  MORIOKA Tomohiko  <tomo@m17n.org>
 
@@ -2458,7 +2499,7 @@
 \f
 1999-01-21  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.13.0 (Matt\e-Dò)\e-A released.
+       * SEMI: Version 1.13.0 (Matt\e-Dò) released.\e-A
 
 1999-01-21  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -2956,7 +2997,7 @@
 \f
 1998-07-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * REMI: Version 1.8.3 (Ecch\e-Dþ-Nakagawa)\e-A released.
+       * REMI: Version 1.8.3 (Ecch\e-Dþ-Nakagawa) released.\e-A
 
        * mime-play.el (mime-delq-null-situation): Add new optional
        argument `ignored-value'.
@@ -2985,7 +3026,7 @@
 \f
 1998-07-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * REMI: Version 1.8.2 (N\e-Dòmachi)\e-A released.
+       * REMI: Version 1.8.2 (N\e-Dòmachi) released.\e-A
 
 1998-07-07  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -3104,7 +3145,7 @@
 \f
 1998-06-28  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * REMI: Version 1.8.0 (Ecch\e-Dþ-Kokubu)\e-A released.
+       * REMI: Version 1.8.0 (Ecch\e-Dþ-Kokubu) released.\e-A
 
 1998-06-26  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -3940,7 +3981,7 @@
 \f
 1998-06-04  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.5.0 (Nishi-Ny\e-Dþzen)\e-A released.
+       * SEMI: Version 1.5.0 (Nishi-Ny\e-Dþzen) released.\e-A
 
        * README.en (Required environment): Modify for FLIM 1.3.0.
 
@@ -3992,7 +4033,7 @@
 \f
 1998-06-01  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.4.6 (Ny\e-Dþzen)\e-A released.
+       * SEMI: Version 1.4.6 (Ny\e-Dþzen) released.\e-A
 
 1998-05-28  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -4205,7 +4246,7 @@
 \f
 1998-05-15  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.4.4 (Ecch\e-Dþ-Miyazaki)\e-A released.
+       * SEMI: Version 1.4.4 (Ecch\e-Dþ-Miyazaki) released.\e-A
 
        * mime-play.el (mime-mailcap-method-filename-alist): New variable.
        (mime-mailcap-method-sentinel): New function.
@@ -4331,7 +4372,7 @@
 \f
 1998-05-06  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.4.1 (\e-DÒmi)\e-A released.
+       * SEMI: Version 1.4.1 (\e-DÒmi) released.\e-A
 
        * README.en (Required environment): Modify for FLIM 1.2.0.
 
@@ -4491,7 +4532,7 @@
 \f
 1998-04-25  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.3.2 (N\e-Dò)\e-A was released.
+       * SEMI: Version 1.3.2 (N\e-Dò) was released.\e-A
 
        * mime-edit.el (mime-edit-mode-entity-prefix): New variable.
        (mime-edit-mode-entity-map): New variable.
@@ -5146,7 +5187,7 @@
 \f
 1998-03-13  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.0.2 (Nonoichi-K\e-Dòdaimae)\e-A was released.
+       * SEMI: Version 1.0.2 (Nonoichi-K\e-Dòdaimae) was released.\e-A
 
 1998-03-12  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
@@ -5258,7 +5299,7 @@
 \f
 1998-02-25  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 1.0.0 (Nukaj\e-Dþtaku-mae)\e-A was released.
+       * SEMI: Version 1.0.0 (Nukaj\e-Dþtaku-mae) was released.\e-A
 
        * SEMI-ELS: Remove mime-tar.el.
 
@@ -5395,7 +5436,7 @@
 \f
 1997-11-16  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
-       * SEMI: Version 0.116 (D\e-Dòhòji)\e-A was released.
+       * SEMI: Version 0.116 (D\e-Dòhòji) was released.\e-A
 
 1997-11-15  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 

diff --git a/README.en b/README.en
index b1cd6b6..e15eac2 100644 (file)
--- a/README.en
+++ b/README.en
@@ -43,7 +43,7 @@ Required environment
   SEMI also does not support Emacs 19.29 to 19.34, XEmacs 19.15 or
   XEmacs 20.2, but SEMI may work with them.
 
-  SEMI requires APEL (9.22 or later) and FLIM (1.14.2 or later)
+  SEMI requires APEL (10.7 or later) and FLIM (1.14.2 or later)
   package.  Please install them before installing it.  APEL package is
   available at:
 

diff --git a/SEMI-CFG b/SEMI-CFG
index 7485f10..aa74aa3 100644 (file)
--- a/SEMI-CFG
+++ b/SEMI-CFG
@@ -153,18 +153,6 @@
        "tm-plain" "tm-ps"
        "tmdecode"))
 
-(defvar PACKAGEDIR
-  (if (boundp 'early-packages)
-      (let ((dirs (append (if early-package-load-path
-                             early-packages)
-                         (if late-package-load-path
-                             late-packages)
-                         (if last-package-load-path
-                             last-packages)))
-           dir)
-       (while (not (file-exists-p
-                    (setq dir (car dirs))))
-         (setq dirs (cdr dirs)))
-       dir)))
+(defvar PACKAGEDIR (install-get-default-package-directory))
 
 ;;; SEMI-CFG ends here

diff --git a/SEMI-MK b/SEMI-MK
index 2aed7f1..482deba 100644 (file)
--- a/SEMI-MK
+++ b/SEMI-MK
@@ -70,9 +70,15 @@ LISPDIR=%s\n" PREFIX LISPDIR))
 (defun compile-semi-package ()
   (config-semi-package)
 
-  (setq autoload-package-name "semi")
-  (add-to-list 'command-line-args-left ".")
-  (batch-update-directory)
+  (if (fboundp 'batch-update-directory-autoloads)
+      ;; XEmacs 21.5.19 and newer.
+      (progn
+       (add-to-list 'command-line-args-left ".")
+       (add-to-list 'command-line-args-left "semi")
+       (batch-update-directory-autoloads))
+    (setq autoload-package-name "semi")
+    (add-to-list 'command-line-args-left ".")
+    (batch-update-directory))
 
   (add-to-list 'command-line-args-left ".")
   (Custom-make-dependencies)

diff --git a/mime-edit.el b/mime-edit.el
index b63ee82..d0537cb 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -1020,10 +1020,11 @@ User customizable variables (not documented all of them):
     (if (featurep 'xemacs)
        (mime-edit-define-menu-for-xemacs))
 
-    ;; I don't care about saving these.
+    (make-local-variable 'paragraph-start)
     (setq paragraph-start
          (regexp-or mime-edit-single-part-tag-regexp
                     paragraph-start))
+    (make-local-variable 'paragraph-separate)
     (setq paragraph-separate
          (regexp-or mime-edit-single-part-tag-regexp
                     paragraph-separate))